From 46b1cbf73934f06291403c5046f3fd1e824d21cc Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Tue, 2 Jul 2024 18:33:27 +0200 Subject: [PATCH] Add downloading state --- .../all-clusters-minimal-app.matter | 5 +++-- examples/placeholder/linux/apps/app1/config.matter | 10 ++++++---- examples/placeholder/linux/apps/app2/config.matter | 10 ++++++---- .../matter/tv/server/tvapp/LauncherResponse.java | 3 ++- examples/tv-app/tv-common/tv-app.matter | 5 +++-- .../tv-casting-common/tv-casting-app.matter | 5 +++-- .../chip/application-launcher-cluster.xml | 5 +++-- .../data_model/controller-clusters.matter | 5 +++-- src/controller/python/chip/clusters/Objects.py | 7 ++++--- .../Framework/CHIP/zap-generated/MTRBaseClusters.h | 5 +++-- .../app-common/zap-generated/cluster-enums-check.h | 5 +++-- .../app-common/zap-generated/cluster-enums.h | 13 +++++++------ 12 files changed, 46 insertions(+), 32 deletions(-) diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 11ef99302f982d..811285c742aff1 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -5264,8 +5264,9 @@ cluster ApplicationLauncher = 1292 { kSuccess = 0; kAppNotAvailable = 1; kSystemBusy = 2; - kStatusPending = 3; - kStatusInstalling = 4; + kPending = 3; + kDownloading = 4; + kInstalling = 5; } bitmap Feature : bitmap32 { diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index c6652e5a57aef2..0e12e0d5c7e42d 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -7895,8 +7895,9 @@ cluster ApplicationLauncher = 1292 { kSuccess = 0; kAppNotAvailable = 1; kSystemBusy = 2; - kStatusPending = 3; - kStatusInstalling = 4; + kPending = 3; + kDownloading = 4; + kInstalling = 5; } bitmap Feature : bitmap32 { @@ -7956,8 +7957,9 @@ cluster ApplicationLauncher = 1292 { kSuccess = 0; kAppNotAvailable = 1; kSystemBusy = 2; - kStatusPending = 3; - kStatusInstalling = 4; + kPending = 3; + kDownloading = 4; + kInstalling = 5; } bitmap Feature : bitmap32 { diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 4a35eaced2cf6f..0f34963d020c7c 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -7852,8 +7852,9 @@ cluster ApplicationLauncher = 1292 { kSuccess = 0; kAppNotAvailable = 1; kSystemBusy = 2; - kStatusPending = 3; - kStatusInstalling = 4; + kPending = 3; + kDownloading = 4; + kInstalling = 5; } bitmap Feature : bitmap32 { @@ -7913,8 +7914,9 @@ cluster ApplicationLauncher = 1292 { kSuccess = 0; kAppNotAvailable = 1; kSystemBusy = 2; - kStatusPending = 3; - kStatusInstalling = 4; + kPending = 3; + kDownloading = 4; + kInstalling = 5; } bitmap Feature : bitmap32 { diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/LauncherResponse.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/LauncherResponse.java index 391f92b82f319e..27da03b81954dd 100644 --- a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/LauncherResponse.java +++ b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/LauncherResponse.java @@ -6,7 +6,8 @@ public class LauncherResponse { public static final int STATUS_APP_NOT_AVAILABLE = 1; public static final int STATUS_SYSTEM_BUSY = 2; public static final int STATUS_PENDING = 3; - public static final int STATUS_INSTALLING = 4; + public static final int STATUS_DOWNLOADING = 4; + public static final int STATUS_INSTALLING = 5; public LauncherResponse(int status, String data) { this.status = status; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index d7580cbb37ddbe..8c0b9b5fafa55d 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -2928,8 +2928,9 @@ cluster ApplicationLauncher = 1292 { kSuccess = 0; kAppNotAvailable = 1; kSystemBusy = 2; - kStatusPending = 3; - kStatusInstalling = 4; + kPending = 3; + kDownloading = 4; + kInstalling = 5; } bitmap Feature : bitmap32 { diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index c486bed08a3400..ed15eae3021267 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -2390,8 +2390,9 @@ cluster ApplicationLauncher = 1292 { kSuccess = 0; kAppNotAvailable = 1; kSystemBusy = 2; - kStatusPending = 3; - kStatusInstalling = 4; + kPending = 3; + kDownloading = 4; + kInstalling = 5; } bitmap Feature : bitmap32 { diff --git a/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml index b9ec3964ab069e..1f7aad0a3080dc 100644 --- a/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml @@ -80,7 +80,8 @@ limitations under the License. - - + + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 2cb1e428eda06a..72ce3f91c79ae2 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -8870,8 +8870,9 @@ cluster ApplicationLauncher = 1292 { kSuccess = 0; kAppNotAvailable = 1; kSystemBusy = 2; - kStatusPending = 3; - kStatusInstalling = 4; + kPending = 3; + kDownloading = 4; + kInstalling = 5; } bitmap Feature : bitmap32 { diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 4798a420ce6896..5b563d48e4efdf 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -44602,13 +44602,14 @@ class StatusEnum(MatterIntEnum): kSuccess = 0x00 kAppNotAvailable = 0x01 kSystemBusy = 0x02 - kStatusPending = 0x03 - kStatusInstalling = 0x04 + kPending = 0x03 + kDownloading = 0x04 + kInstalling = 0x05 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only # be used by code to process how it handles receiving and unknown # enum value. This specific should never be transmitted. - kUnknownEnumValue = 5, + kUnknownEnumValue = 6, class Bitmaps: class Feature(IntFlag): diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 1d72edd8695702..dbc0d7859c0aa8 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -20522,8 +20522,9 @@ typedef NS_ENUM(uint8_t, MTRApplicationLauncherStatus) { MTRApplicationLauncherStatusSuccess MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, MTRApplicationLauncherStatusAppNotAvailable MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, MTRApplicationLauncherStatusSystemBusy MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRApplicationLauncherStatusStatusPending MTR_PROVISIONALLY_AVAILABLE = 0x03, - MTRApplicationLauncherStatusStatusInstalling MTR_PROVISIONALLY_AVAILABLE = 0x04, + MTRApplicationLauncherStatusPending MTR_PROVISIONALLY_AVAILABLE = 0x03, + MTRApplicationLauncherStatusDownloading MTR_PROVISIONALLY_AVAILABLE = 0x04, + MTRApplicationLauncherStatusInstalling MTR_PROVISIONALLY_AVAILABLE = 0x05, } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_OPTIONS(uint32_t, MTRApplicationLauncherFeature) { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index f57d2f217fcf20..c547554d3e814f 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -3352,8 +3352,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(ApplicationLauncher::St case EnumType::kSuccess: case EnumType::kAppNotAvailable: case EnumType::kSystemBusy: - case EnumType::kStatusPending: - case EnumType::kStatusInstalling: + case EnumType::kPending: + case EnumType::kDownloading: + case EnumType::kInstalling: return val; default: return EnumType::kUnknownEnumValue; diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index f8c24b9bd4175c..073aa8146c58c1 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -5056,16 +5056,17 @@ namespace ApplicationLauncher { // Enum for StatusEnum enum class StatusEnum : uint8_t { - kSuccess = 0x00, - kAppNotAvailable = 0x01, - kSystemBusy = 0x02, - kStatusPending = 0x03, - kStatusInstalling = 0x04, + kSuccess = 0x00, + kAppNotAvailable = 0x01, + kSystemBusy = 0x02, + kPending = 0x03, + kDownloading = 0x04, + kInstalling = 0x05, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown // enum value. This specific should never be transmitted. - kUnknownEnumValue = 5, + kUnknownEnumValue = 6, }; // Bitmap for Feature