From dd0c9c33050ce10a34331de369da800cf8592ea2 Mon Sep 17 00:00:00 2001 From: Raptor Engineering Development Team Date: Thu, 25 Jan 2018 03:51:45 -0600 Subject: Lock out zones based on all conditions not matched instead of any condition not matched This restores CPU1 fan control on Talos systems when CPU1 is installed. --- control/gen-fan-zone-defs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control/gen-fan-zone-defs.py b/control/gen-fan-zone-defs.py index f39a414..fb8fd64 100755 --- a/control/gen-fan-zone-defs.py +++ b/control/gen-fan-zone-defs.py @@ -664,9 +664,9 @@ def getEventsInZone(zone_num, zone_conditions, events_data): for p in e['precondition']['events']: # Verify precondition applies to current zone if 'zone_conditions' in p: + zone_allowed = False for zc in p['zone_conditions']: if 'zones' in zc: - zone_allowed = False for z in zc['zones']: if z == zone_num: zone_allowed = True -- cgit v1.2.1