Skip to content

Commit f9e5019

Browse files
authored
Merge pull request #60 from fpistm/payload_reset
fix: TL_Evt_t payload size for reset
2 parents 2017ab4 + 2a070fa commit f9e5019

5 files changed

+37
-7
lines changed

Diff for: extras/STM32Cube_FW/0001-chore-adapt-STM32Cube_FW-sources.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From fd17a2302d60208768610cb4723eb403c52ff2b1 Mon Sep 17 00:00:00 2001
1+
From 542e007fa5a1b53664d2efb5f01d67767123a357 Mon Sep 17 00:00:00 2001
22
From: Frederic Pillon <[email protected]>
33
Date: Thu, 13 Jul 2023 17:08:05 +0200
4-
Subject: [PATCH 1/3] chore: adapt STM32Cube_FW sources
4+
Subject: [PATCH 1/4] chore: adapt STM32Cube_FW sources
55

66
Signed-off-by: Frederic Pillon <[email protected]>
77
---

Diff for: extras/STM32Cube_FW/0002-fix-include-a-timeout-when-waiting-for-the-cmd_resp.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 598c654f18fc9389be8326610a51052943151f04 Mon Sep 17 00:00:00 2001
1+
From 5d07a0e5c0463965f8cf8dde6076b5cf2c779e90 Mon Sep 17 00:00:00 2001
22
From: Frederic Pillon <[email protected]>
33
Date: Thu, 13 Jul 2023 17:16:40 +0200
4-
Subject: [PATCH 2/3] fix: include a timeout when waiting for the cmd_resp
4+
Subject: [PATCH 2/4] fix: include a timeout when waiting for the cmd_resp
55

66
Signed-off-by: Frederic Pillon <[email protected]>
77
---

Diff for: extras/STM32Cube_FW/0003-chore-add-support-for-customize-app_conf_default.h.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 663ed22fd680de1f32c542df0799c403665ecb2e Mon Sep 17 00:00:00 2001
1+
From 370e1082edae9b69d50f824db85b5cbe3b786e79 Mon Sep 17 00:00:00 2001
22
From: Frederic Pillon <[email protected]>
33
Date: Mon, 12 Dec 2022 17:29:27 +0100
4-
Subject: [PATCH 3/3] chore: add support for customize app_conf_default.h
4+
Subject: [PATCH 3/4] chore: add support for customize app_conf_default.h
55

66
Signed-off-by: Frederic Pillon <[email protected]>
77
---
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From b294edcaee311c15dfb307ea1298ae88b16a92bf Mon Sep 17 00:00:00 2001
2+
From: Frederic Pillon <[email protected]>
3+
Date: Mon, 24 Jul 2023 10:55:20 +0200
4+
Subject: [PATCH 4/4] fix: TL_Evt_t payload size for reset
5+
6+
Within STM32CubeWB v1.17.0 update TL_Evt_t payload size was reduced.
7+
This produce a warning -Warray-bounds due to the reset management
8+
which require 4 bytes.
9+
10+
Signed-off-by: Frederic Pillon <[email protected]>
11+
---
12+
src/utility/STM32Cube_FW/tl.h | 2 +-
13+
1 file changed, 1 insertion(+), 1 deletion(-)
14+
15+
diff --git a/src/utility/STM32Cube_FW/tl.h b/src/utility/STM32Cube_FW/tl.h
16+
index 8e8c6cb..7452087 100644
17+
--- a/src/utility/STM32Cube_FW/tl.h
18+
+++ b/src/utility/STM32Cube_FW/tl.h
19+
@@ -108,7 +108,7 @@ typedef PACKED_STRUCT
20+
{
21+
uint8_t evtcode;
22+
uint8_t plen;
23+
- uint8_t payload[2];
24+
+ uint8_t payload[4];
25+
} TL_Evt_t;
26+
27+
typedef PACKED_STRUCT
28+
--
29+
2.38.0.windows.1
30+

Diff for: src/utility/STM32Cube_FW/tl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ typedef PACKED_STRUCT
108108
{
109109
uint8_t evtcode;
110110
uint8_t plen;
111-
uint8_t payload[2];
111+
uint8_t payload[4];
112112
} TL_Evt_t;
113113

114114
typedef PACKED_STRUCT

0 commit comments

Comments
 (0)