feat(gateway): enhance DALI command handling with mirroring and new target types

2026-05-02 03:19:02 +08:00
parent 639fdd860e
commit fa2eae87cf
4 changed files with 587 additions and 63 deletions
@@ -35,6 +35,17 @@ enum class GatewayCacheRawFrameOrigin : uint8_t {
  kOutsideBus = 1,
 };

+enum class GatewayCacheDaliTargetKind : uint8_t {
+  kShortAddress = 0,
+  kGroup = 1,
+  kBroadcast = 2,
+};
+
+struct GatewayCacheDaliTarget {
+  GatewayCacheDaliTargetKind kind{GatewayCacheDaliTargetKind::kShortAddress};
+  uint8_t value{0};
+};
+
 struct GatewayCacheChannelFlags {
  bool need_update_group{false};
  bool need_update_scene{false};
@@ -56,11 +67,23 @@ struct GatewayCacheDaliSettingsSnapshot {
  }
 };

+struct GatewayCacheDaliRuntimeStatus {
+  std::optional<uint8_t> actual_level;
+  std::optional<uint8_t> scene_id;
+  bool use_min_level{false};
+  uint32_t revision{0};
+
+  bool anyKnown() const {
+    return actual_level.has_value() || scene_id.has_value() || use_min_level;
+  }
+};
+
 struct GatewayCacheDaliAddressState {
  bool group_mask_known{false};
  uint16_t group_mask{0};
  std::array<std::optional<uint8_t>, 16> scene_levels{};
  GatewayCacheDaliSettingsSnapshot settings;
+  GatewayCacheDaliRuntimeStatus status;
 };

 class GatewayCache {
@@ -113,6 +136,8 @@ class GatewayCache {
  GatewayCacheChannelFlags channelFlags(uint8_t gateway_id);
  GatewayCacheChannelFlags pendingChannelFlags(uint8_t gateway_id);
  GatewayCacheDaliAddressState daliAddressState(uint8_t gateway_id, uint8_t short_address);
+  GatewayCacheDaliRuntimeStatus daliGroupStatus(uint8_t gateway_id, uint8_t group_id);
+  GatewayCacheDaliRuntimeStatus daliBroadcastStatus(uint8_t gateway_id);
  bool setDaliGroupMask(uint8_t gateway_id, uint8_t short_address,
                        std::optional<uint16_t> group_mask);
  bool setDaliSceneLevel(uint8_t gateway_id, uint8_t short_address, uint8_t scene_id,
@@ -127,6 +152,7 @@ class GatewayCache {
  bool cacheEnabled() const;
  bool reconciliationEnabled() const;
  bool fullStateMirrorEnabled() const;
+  bool mirrorDaliCommand(uint8_t gateway_id, uint8_t raw_addr, uint8_t command);
  bool observeDaliCommand(uint8_t gateway_id, uint8_t raw_addr, uint8_t command,
                          GatewayCacheRawFrameOrigin origin);

@@ -150,8 +176,31 @@ class GatewayCache {
  bool persistGroupLocked(uint8_t gateway_id, uint8_t group_id, const GroupEntry& group);
  bool commitStorageLocked();
  bool shouldTrackUpdateFlagsLocked() const;
+  uint32_t nextDaliRuntimeRevisionLocked();
+  bool mirrorDaliCommandLocked(uint8_t gateway_id, uint8_t raw_addr, uint8_t command);
+  void clearDaliTargetStateLocked(uint8_t gateway_id, const GatewayCacheDaliTarget& target,
+                                  uint32_t revision);
+  void applyDaliTargetRuntimeStatusLocked(uint8_t gateway_id,
+                                          const GatewayCacheDaliTarget& target,
+                                          const GatewayCacheDaliRuntimeStatus& status);
+  void applyDaliRuntimeStatusToAddressLocked(GatewayCacheDaliAddressState& state,
+                                             const GatewayCacheDaliRuntimeStatus& status);
+  void applyDaliTargetGroupMutationLocked(uint8_t gateway_id,
+                                          const GatewayCacheDaliTarget& target, uint8_t group_id,
+                                          bool add_to_group);
+  void applyDaliTargetSceneLevelLocked(uint8_t gateway_id,
+                                       const GatewayCacheDaliTarget& target, uint8_t scene_id,
+                                       std::optional<uint8_t> level);
+  void applyDaliTargetSettingsLocked(uint8_t gateway_id,
+                                     const GatewayCacheDaliTarget& target, uint8_t command,
+                                     uint8_t value);
+  void refreshDaliAddressAggregateStatusLocked(uint8_t gateway_id,
+                                               GatewayCacheDaliAddressState& state);
  GatewayCacheDaliAddressState& ensureDaliAddressStateLocked(uint8_t gateway_id,
                                                             uint8_t short_address);
+  GatewayCacheDaliRuntimeStatus& ensureDaliGroupStatusLocked(uint8_t gateway_id,
+                                                             uint8_t group_id);
+  GatewayCacheDaliRuntimeStatus& ensureDaliBroadcastStatusLocked(uint8_t gateway_id);
  SceneStore& ensureSceneStoreLocked(uint8_t gateway_id);
  GroupStore& ensureGroupStoreLocked(uint8_t gateway_id);
  void loadSceneStoreLocked(uint8_t gateway_id, SceneStore& scenes);
@@ -168,8 +217,11 @@ class GatewayCache {
  std::map<uint8_t, SceneStore> scenes_;
  std::map<uint8_t, GroupStore> groups_;
  std::map<uint8_t, std::array<GatewayCacheDaliAddressState, 64>> dali_states_;
+  std::map<uint8_t, std::array<GatewayCacheDaliRuntimeStatus, 16>> dali_group_status_;
+  std::map<uint8_t, GatewayCacheDaliRuntimeStatus> dali_broadcast_status_;
  std::map<uint8_t, DtrState> dtr_states_;
  std::map<uint8_t, GatewayCacheChannelFlags> channel_flags_;
+  uint32_t dali_runtime_revision_{0};
  bool dirty_{false};
 };