PR #13665 from remibettan: adding D436 device

common/device-model.cpp

@@ -267,7 +267,8 @@ namespace rs2
 
             auto dev_name = get_device_name(dev);
 
-            if( ( dev.is<update_device>() || is_upgradeable( fw, recommended_fw_ver) ) )
+            // TODO - D436. Don't suggest to update FW as it doesn't support D436. Revert after next release with bundle supporting FW
+            if( ( dev.is<update_device>() || is_upgradeable( fw, recommended_fw_ver) ) && pid != "1156") //0x1156 is pid for D436
             {
                 std::stringstream msg;
 

scripts/realsense-metadata-focal-hwe-5.13.patch

@@ -1,4 +1,4 @@
-From 7480bd53bd1af5a11fc890e6b9a1a2991bfa6a28 Mon Sep 17 00:00:00 2001
+From ddde28a28ea29750a7a9cf486d8f46283c755745 Mon Sep 17 00:00:00 2001
 From: Dmitry Perchanov <[email protected]>
 Date: Sun, 22 Jan 2023 13:46:16 +0200
 Subject: [PATCH] Enabling UVC Metadata attributes with Ubuntu 20.04. Kernel
@@ -8,15 +8,15 @@ Co-developed-by: Yu MENG <[email protected]>
 Co-developed-by: Evgeni Raikhel <[email protected]>
 Signed-off-by: Dmitry Perchanov <[email protected]>
 ---
- drivers/media/usb/uvc/uvc_driver.c | 288 +++++++++++++++++++++++++++++
+ drivers/media/usb/uvc/uvc_driver.c | 297 +++++++++++++++++++++++++++++
  drivers/media/usb/uvc/uvcvideo.h   |   2 +-
- 2 files changed, 289 insertions(+), 1 deletion(-)
+ 2 files changed, 298 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
-index 205d52412..e167ec854 100644
+index 205d52412..622c8bc06 100644
 --- a/drivers/media/usb/uvc/uvc_driver.c
 +++ b/drivers/media/usb/uvc/uvc_driver.c
-@@ -3221,6 +3221,294 @@ static const struct usb_device_id uvc_ids[] = {
+@@ -3221,6 +3221,303 @@ static const struct usb_device_id uvc_ids[] = {
  	  .bInterfaceSubClass	= 1,
  	  .bInterfaceProtocol	= 0,
  	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
@@ -191,6 +191,15 @@ index 205d52412..e167ec854 100644
 +	  .bInterfaceSubClass	= 1,
 +	  .bInterfaceProtocol	= 0,
 +	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
++	  /* Intel D436 depth camera */
++	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
++				| USB_DEVICE_ID_MATCH_INT_INFO,
++	  .idVendor			= 0x8086,
++	  .idProduct		= 0x1156,
++	  .bInterfaceClass	= USB_CLASS_VIDEO,
++	  .bInterfaceSubClass	= 1,
++	  .bInterfaceProtocol	= 0,
++	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
 +	  /* Intel L515 Pre-PRQ */
 +	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
 +				| USB_DEVICE_ID_MATCH_INT_INFO,

scripts/realsense-metadata-focal-hwe-5.15.patch

@@ -1,4 +1,4 @@
-From 1d10a22a198d8b54c252de46efd4b05396bc0aed Mon Sep 17 00:00:00 2001
+From 32b0a7afe8c609472f447adfb726a5e42ea99d17 Mon Sep 17 00:00:00 2001
 From: Dmitry Perchanov <[email protected]>
 Date: Sun, 22 Jan 2023 13:46:16 +0200
 Subject: [PATCH] Enabling UVC Metadata attributes with Ubuntu 20.04. Kernel
@@ -8,15 +8,15 @@ Co-developed-by: Yu MENG <[email protected]>
 Co-developed-by: Evgeni Raikhel <[email protected]>
 Signed-off-by: Dmitry Perchanov <[email protected]>
 ---
- drivers/media/usb/uvc/uvc_driver.c | 288 +++++++++++++++++++++++++++++
+ drivers/media/usb/uvc/uvc_driver.c | 297 +++++++++++++++++++++++++++++
  drivers/media/usb/uvc/uvcvideo.h   |   2 +-
- 2 files changed, 289 insertions(+), 1 deletion(-)
+ 2 files changed, 298 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
-index 2816f79ef..81b86da7c 100644
+index 0e3a8b38c..fcf0159d8 100644
 --- a/drivers/media/usb/uvc/uvc_driver.c
 +++ b/drivers/media/usb/uvc/uvc_driver.c
-@@ -3221,6 +3221,294 @@ static const struct usb_device_id uvc_ids[] = {
+@@ -3215,6 +3215,303 @@ static const struct usb_device_id uvc_ids[] = {
  	  .bInterfaceSubClass	= 1,
  	  .bInterfaceProtocol	= 0,
  	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
@@ -191,6 +191,15 @@ index 2816f79ef..81b86da7c 100644
 +	  .bInterfaceSubClass	= 1,
 +	  .bInterfaceProtocol	= 0,
 +	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
++	  /* Intel D436 depth camera */
++	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
++				| USB_DEVICE_ID_MATCH_INT_INFO,
++	  .idVendor			= 0x8086,
++	  .idProduct		= 0x1156,
++	  .bInterfaceClass	= USB_CLASS_VIDEO,
++	  .bInterfaceSubClass	= 1,
++	  .bInterfaceProtocol	= 0,
++	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
 +	  /* Intel L515 Pre-PRQ */
 +	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
 +				| USB_DEVICE_ID_MATCH_INT_INFO,
@@ -312,7 +321,7 @@ index 2816f79ef..81b86da7c 100644
  	{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_UNDEFINED) },
  	{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_15) },
 diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
-index 098cc8fa4..5d252335c 100644
+index 242fa9352..0b7067c1d 100644
 --- a/drivers/media/usb/uvc/uvcvideo.h
 +++ b/drivers/media/usb/uvc/uvcvideo.h
 @@ -221,7 +221,7 @@

scripts/realsense-metadata-focal-master.patch

@@ -1,4 +1,4 @@
-From e6e4fd91cdfdb0b9cbb439916ebd12d61f1ff1b4 Mon Sep 17 00:00:00 2001
+From 4219d7a6e4f4c9c2b063402b167f1288dabba0ca Mon Sep 17 00:00:00 2001
 From: Dmitry Perchanov <[email protected]>
 Date: Mon, 21 Aug 2023 15:10:57 +0300
 Subject: [PATCH] Enabling UVC Metadata attributes with Ubuntu 20.04. Kernel
@@ -7,15 +7,15 @@ Subject: [PATCH] Enabling UVC Metadata attributes with Ubuntu 20.04. Kernel
 Co-developed-by: Evgeni Raikhel <[email protected]>
 Signed-off-by: Dmitry Perchanov <[email protected]>
 ---
- drivers/media/usb/uvc/uvc_driver.c | 279 +++++++++++++++++++++++++++++
+ drivers/media/usb/uvc/uvc_driver.c | 288 +++++++++++++++++++++++++++++
  drivers/media/usb/uvc/uvcvideo.h   |   2 +-
- 2 files changed, 280 insertions(+), 1 deletion(-)
+ 2 files changed, 289 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
-index 3be9bc97f..386832678 100644
+index b77eef67d..c0b9bd21a 100644
 --- a/drivers/media/usb/uvc/uvc_driver.c
 +++ b/drivers/media/usb/uvc/uvc_driver.c
-@@ -2916,6 +2916,285 @@ static const struct usb_device_id uvc_ids[] = {
+@@ -3029,6 +3029,294 @@ static const struct usb_device_id uvc_ids[] = {
  	  .bInterfaceSubClass	= 1,
  	  .bInterfaceProtocol	= 0,
  	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
@@ -190,6 +190,15 @@ index 3be9bc97f..386832678 100644
 +	  .bInterfaceSubClass	= 1,
 +	  .bInterfaceProtocol	= 0,
 +	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
++	  /* Intel D436 depth camera */
++	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
++				| USB_DEVICE_ID_MATCH_INT_INFO,
++	  .idVendor			= 0x8086,
++	  .idProduct		= 0x1156,
++	  .bInterfaceClass	= USB_CLASS_VIDEO,
++	  .bInterfaceSubClass	= 1,
++	  .bInterfaceProtocol	= 0,
++	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
 +	  /* Intel L515 Pre-PRQ */
 +	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
 +				| USB_DEVICE_ID_MATCH_INT_INFO,
@@ -302,10 +311,10 @@ index 3be9bc97f..386832678 100644
  	{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_UNDEFINED) },
  	{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_15) },
 diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
-index a3dfacf06..898eebe42 100644
+index ced37a11a..01a3923b3 100644
 --- a/drivers/media/usb/uvc/uvcvideo.h
 +++ b/drivers/media/usb/uvc/uvcvideo.h
-@@ -181,7 +181,7 @@
+@@ -215,7 +215,7 @@
  /* Maximum number of packets per URB. */
  #define UVC_MAX_PACKETS		32
  /* Maximum status buffer size in bytes of interrupt URB. */
@@ -315,5 +324,5 @@ index a3dfacf06..898eebe42 100644
  #define UVC_CTRL_CONTROL_TIMEOUT	500
  #define UVC_CTRL_STREAMING_TIMEOUT	5000
 -- 
-2.34.1
+2.25.1
 

scripts/realsense-metadata-jammy-hwe-6.2.patch

@@ -1,20 +1,20 @@
-From 3df5a4700229bd76b6c460e0b26529637f3ed172 Mon Sep 17 00:00:00 2001
+From c66fc5a4acc09b51d5ad0cf9b1c9cfc07b595b16 Mon Sep 17 00:00:00 2001
 From: Dmitry Perchanov <[email protected]>
 Date: Sun, 13 Aug 2023 12:13:21 +0300
 Subject: [PATCH] Enabling UVC Metadata attributes, Ubuntu jammy 22.04. Kernel
  6.2
 
 Signed-off-by: Dmitry Perchanov <[email protected]>
 ---
- drivers/media/usb/uvc/uvc_driver.c | 99 ++++++++++++++++++++++++++++++
- drivers/media/usb/uvc/uvcvideo.h   |  2 +-
- 2 files changed, 100 insertions(+), 1 deletion(-)
+ drivers/media/usb/uvc/uvc_driver.c | 108 +++++++++++++++++++++++++++++
+ drivers/media/usb/uvc/uvcvideo.h   |   2 +-
+ 2 files changed, 109 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
-index 362df9dd3..3fedf65ab 100644
+index 5ab3fc04c..6b1c6153b 100644
 --- a/drivers/media/usb/uvc/uvc_driver.c
 +++ b/drivers/media/usb/uvc/uvc_driver.c
-@@ -2963,6 +2963,33 @@ static const struct usb_device_id uvc_ids[] = {
+@@ -2969,6 +2969,33 @@ static const struct usb_device_id uvc_ids[] = {
  	  .bInterfaceSubClass	= 1,
  	  .bInterfaceProtocol	= 0,
  	  .driver_info		= (kernel_ulong_t)&uvc_ctrl_power_line_limited },
@@ -48,7 +48,7 @@ index 362df9dd3..3fedf65ab 100644
  	/* Intel RealSense D4M */
  	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
  				| USB_DEVICE_ID_MATCH_INT_INFO,
-@@ -2972,6 +2999,78 @@ static const struct usb_device_id uvc_ids[] = {
+@@ -2978,6 +3005,87 @@ static const struct usb_device_id uvc_ids[] = {
  	  .bInterfaceSubClass	= 1,
  	  .bInterfaceProtocol	= 0,
  	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
@@ -70,6 +70,15 @@ index 362df9dd3..3fedf65ab 100644
 +	  .bInterfaceSubClass	= 1,
 +	  .bInterfaceProtocol	= 0,
 +	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
++	/* Intel D436 depth camera */
++	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
++				| USB_DEVICE_ID_MATCH_INT_INFO,
++	  .idVendor		= 0x8086,
++	  .idProduct		= 0x1156,
++	  .bInterfaceClass	= USB_CLASS_VIDEO,
++	  .bInterfaceSubClass	= 1,
++	  .bInterfaceProtocol	= 0,
++	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
 +	/* Intel D555 Depth Camera */
 +	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
 +				| USB_DEVICE_ID_MATCH_INT_INFO,

scripts/realsense-metadata-jammy-hwe-6.5.patch

@@ -1,18 +1,34 @@
-From cd69befded13738c855bb40b99dbee24676f0a41 Mon Sep 17 00:00:00 2001
+From 4b8a3b2cbe9d0f658e72e62b13f5b6ee756372dd Mon Sep 17 00:00:00 2001
 From: Dmitry <[email protected]>
 Date: Sun, 7 Jul 2024 04:56:36 -0400
 Subject: [PATCH] RealSense UVC Metadata, jammy kernel 6.5
 
 Signed-off-by: Dmitry <[email protected]>
 ---
- drivers/media/usb/uvc/uvc_driver.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
+ drivers/media/usb/uvc/uvc_driver.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
 
 diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
-index fb3e43dde..b04271d30 100644
+index 7b6479dac..bc92234db 100644
 --- a/drivers/media/usb/uvc/uvc_driver.c
 +++ b/drivers/media/usb/uvc/uvc_driver.c
-@@ -3147,6 +3147,15 @@ static const struct usb_device_id uvc_ids[] = {
+@@ -3084,6 +3084,15 @@ static const struct usb_device_id uvc_ids[] = {
+ 	  .bInterfaceSubClass	= 1,
+ 	  .bInterfaceProtocol	= 0,
+ 	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
++	/* Intel D436 depth camera */
++	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
++				| USB_DEVICE_ID_MATCH_INT_INFO,
++	  .idVendor		= 0x8086,
++	  .idProduct		= 0x1156,
++	  .bInterfaceClass	= USB_CLASS_VIDEO,
++	  .bInterfaceSubClass	= 1,
++	  .bInterfaceProtocol	= 0,
++	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
+ 	/* Intel D555 Depth Camera */
+ 	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
+ 				| USB_DEVICE_ID_MATCH_INT_INFO,
+@@ -3129,6 +3138,15 @@ static const struct usb_device_id uvc_ids[] = {
  	  .bInterfaceSubClass	= 1,
  	  .bInterfaceProtocol	= UVC_PC_PROTOCOL_15,
  	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },

scripts/realsense-metadata-jammy-hwe-6.8.patch

@@ -1,20 +1,29 @@
-From 25a687e89e8f365caccef1b9bbb11406e53cc1be Mon Sep 17 00:00:00 2001
+From bf995360a83d28d88308c811a4e91c21b3cdd1e1 Mon Sep 17 00:00:00 2001
 From: Arun-Prasad-V <[email protected]>
 Date: Mon, 5 Aug 2024 15:02:57 +0530
 Subject: [PATCH] Realsense camera metadata support for kernel 6.8
 
 ---
- drivers/media/usb/uvc/uvc_driver.c | 36 ++++++++++++++++++++++++++++++
- 1 file changed, 36 insertions(+)
+ drivers/media/usb/uvc/uvc_driver.c | 45 ++++++++++++++++++++++++++++++
+ 1 file changed, 45 insertions(+)
 
 diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
-index bbd90123a..1cd98a8cc 100644
+index 91a41aa3c..bc04a3182 100644
 --- a/drivers/media/usb/uvc/uvc_driver.c
 +++ b/drivers/media/usb/uvc/uvc_driver.c
-@@ -3102,6 +3102,15 @@ static const struct usb_device_id uvc_ids[] = {
+@@ -3133,6 +3133,24 @@ static const struct usb_device_id uvc_ids[] = {
  	  .bInterfaceSubClass	= 1,
  	  .bInterfaceProtocol	= 0,
  	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
++	/* Intel D436 depth camera */
++	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
++				| USB_DEVICE_ID_MATCH_INT_INFO,
++	  .idVendor		= 0x8086,
++	  .idProduct		= 0x1156,
++	  .bInterfaceClass	= USB_CLASS_VIDEO,
++	  .bInterfaceSubClass	= 1,
++	  .bInterfaceProtocol	= 0,
++	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
 +	/* Intel D555 Depth Camera */
 +	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
 +				| USB_DEVICE_ID_MATCH_INT_INFO,
@@ -27,7 +36,7 @@ index bbd90123a..1cd98a8cc 100644
  	/* Intel D405 Depth Camera */
  	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
  				| USB_DEVICE_ID_MATCH_INT_INFO,
-@@ -3120,6 +3129,33 @@ static const struct usb_device_id uvc_ids[] = {
+@@ -3151,6 +3169,33 @@ static const struct usb_device_id uvc_ids[] = {
  	  .bInterfaceSubClass	= 1,
  	  .bInterfaceProtocol	= 0,
  	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
@@ -62,5 +71,5 @@ index bbd90123a..1cd98a8cc 100644
  	{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_UNDEFINED) },
  	{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_15) },
 -- 
-2.43.0
+2.34.1
 

scripts/realsense-metadata-jammy-master.patch

@@ -1,4 +1,4 @@
-From f8c4dca6a001d42a79a2a7a5d9fc4748bb5df25c Mon Sep 17 00:00:00 2001
+From a2acb950b65b4a8e87451c28dd5a1a6bdaaa7ab6 Mon Sep 17 00:00:00 2001
 From: Dmitry Perchanov <[email protected]>
 Date: Sun, 22 Jan 2023 12:58:19 +0200
 Subject: [PATCH] Enabling UVC Metadata attributes with Ubuntu 22.04. Kernel
@@ -8,15 +8,15 @@ Co-developed-by: Yu MENG <[email protected]>
 Co-developed-by: Evgeni Raikhel <[email protected]>
 Signed-off-by: Dmitry Perchanov <[email protected]>
 ---
- drivers/media/usb/uvc/uvc_driver.c | 288 +++++++++++++++++++++++++++++
+ drivers/media/usb/uvc/uvc_driver.c | 297 +++++++++++++++++++++++++++++
  drivers/media/usb/uvc/uvcvideo.h   |   2 +-
- 2 files changed, 289 insertions(+), 1 deletion(-)
+ 2 files changed, 298 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
-index caed9a2ab..c6763420b 100644
+index caed9a2ab..e72113059 100644
 --- a/drivers/media/usb/uvc/uvc_driver.c
 +++ b/drivers/media/usb/uvc/uvc_driver.c
-@@ -3234,6 +3234,294 @@ static const struct usb_device_id uvc_ids[] = {
+@@ -3234,6 +3234,303 @@ static const struct usb_device_id uvc_ids[] = {
  	  .bInterfaceSubClass	= 1,
  	  .bInterfaceProtocol	= 0,
  	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
@@ -191,6 +191,15 @@ index caed9a2ab..c6763420b 100644
 +	  .bInterfaceSubClass	= 1,
 +	  .bInterfaceProtocol	= 0,
 +	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
++	  /* Intel D436 depth camera */
++	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
++				| USB_DEVICE_ID_MATCH_INT_INFO,
++	  .idVendor			= 0x8086,
++	  .idProduct		= 0x1156,
++	  .bInterfaceClass	= USB_CLASS_VIDEO,
++	  .bInterfaceSubClass	= 1,
++	  .bInterfaceProtocol	= 0,
++	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },
 +	  /* Intel L515 Pre-PRQ */
 +	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
 +				| USB_DEVICE_ID_MATCH_INT_INFO,
@@ -312,7 +321,7 @@ index caed9a2ab..c6763420b 100644
  	{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_UNDEFINED) },
  	{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_15) },
 diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
-index 20782860d..f469327d9 100644
+index 186191290..112b7ea22 100644
 --- a/drivers/media/usb/uvc/uvcvideo.h
 +++ b/drivers/media/usb/uvc/uvcvideo.h
 @@ -224,7 +224,7 @@