rack：fan 命令放行保持时间 sec，风扇断电显示「停」

Co-Authored-By: Claude Opus 5.5 <[email protected]>

rack/backend/prrack/protocol.py

@@ -172,7 +172,15 @@ def build_command(req: dict) -> dict:
         duty = req.get("duty")
         if not isinstance(duty, int) or isinstance(duty, bool) or not 0 <= duty <= 1000:
             raise CmdError("风扇下限必须是 0~1000‰（0 = 自动）")
-        return {"cmd": cmd, "duty": duty}
+        out = {"cmd": cmd, "duty": duty}
+        # 固件 ≥0.1.21：`sec` = 这个下限保持多少秒，到期自动回落到自动（没给 = 一直保持）。
+        sec = req.get("sec")
+        if sec is not None:
+            if not isinstance(sec, int) or isinstance(sec, bool) or not 0 <= sec <= 86400:
+                raise CmdError("风扇下限的保持时间必须是 0~86400 秒（0 / 不给 = 一直保持）")
+            if sec:
+                out["sec"] = sec
+        return out
     raise CmdError("不支持的命令：%r" % (cmd,))
 
 

rack/backend/prrack/simboard.py

@@ -185,7 +185,10 @@ class SimBoard:
             return {"ok": True, "oldest": 0, "next": len(self.events), "ev": ev}
         if cmd == "fan":
             self.fan_floor = req["duty"]
-            return {"ok": True, "floor": self.fan_floor}
+            rsp = {"ok": True, "floor": self.fan_floor}
+            if "sec" in req:
+                rsp["sec"] = req["sec"]  # 模拟板不倒计时：只把形状回对
+            return rsp
         if req.get("seq") is None:
             return {"ok": False, "err": "no_seq"}
         if cmd == "hub":  # 0.1.14：固件 hubctl.h 的命令形状；不模拟倒计时

rack/backend/tests/test_core.py

@@ -59,12 +59,24 @@ def test_build_command_whitelist_and_ranges():
         {"cmd": "power", "rail": True, "on": True},         # bool 不是 int
         {"cmd": "vbus", "rail": 1, "on": 1},
         {"cmd": "fan", "duty": 1001},
+        {"cmd": "fan", "duty": 500, "sec": 86401},
+        {"cmd": "fan", "duty": 500, "sec": -1},
+        {"cmd": "fan", "duty": 500, "sec": "60"},
+        {"cmd": "fan", "duty": 500, "sec": True},
     ]
     for b in bad:
         with pytest.raises(protocol.CmdError):
             protocol.build_command(b)
 
 
+def test_fan_floor_may_carry_a_hold_time():
+    """固件 0.1.21：`sec` 原样带下去；0 / 不给 = 一直保持，命令里就不出现这个键（老固件不认它也没关系）。"""
+    assert protocol.build_command({"cmd": "fan", "duty": 600}) == {"cmd": "fan", "duty": 600}
+    assert protocol.build_command({"cmd": "fan", "duty": 600, "sec": 0}) == {"cmd": "fan", "duty": 600}
+    assert protocol.build_command({"cmd": "fan", "duty": 600, "sec": 90}) == {"cmd": "fan", "duty": 600, "sec": 90}
+    assert protocol.build_command({"cmd": "fan", "duty": 0, "sec": 86400}) == {"cmd": "fan", "duty": 0, "sec": 86400}
+
+
 def test_seq_is_strictly_increasing_and_in_range():
     t = [1700000000.0]
     g = protocol.SeqGen(clock=lambda: t[0])