FIx LUT

Author: rpavlik

adafruit_emc2101/emc2101_lut.py

@@ -81,27 +81,6 @@ class FanSpeedLUT:
  _fan_lut_t8 = UnaryStruct(0x5E, "<B")
  _fan_lut_s8 = UnaryStruct(0x5F, "<B")
 
- _lut_speed_setters = [
- _fan_lut_s1,
- _fan_lut_s2,
- _fan_lut_s3,
- _fan_lut_s4,
- _fan_lut_s5,
- _fan_lut_s6,
- _fan_lut_s7,
- _fan_lut_s8,
- ]
- _lut_temp_setters = [
- _fan_lut_t1,
- _fan_lut_t2,
- _fan_lut_t3,
- _fan_lut_t4,
- _fan_lut_t5,
- _fan_lut_t6,
- _fan_lut_t7,
- _fan_lut_t8,
- ]
-
  def __init__(self, fan_obj):
  self.emc_fan = fan_obj
  self.lut_values = {}
@@ -117,8 +96,10 @@ def __getitem__(self, index):
  def __setitem__(self, index, value):
  if not isinstance(index, int):
  raise IndexError
+ if value > 100.0 or value < 0:
+ raise AttributeError("LUT values must be a fan speed from 0-100%")
  self.lut_values[index] = value
- self._set_lut(self.lut_values)
+ self._set_lut()
 
  def __repr__(self):
  """return the official string representation of the LUT"""
@@ -141,38 +122,33 @@ def __len__(self):
  # their correct spot within the lut table as pairs of set registers, sorted with the lowest
  # temperature first
 
- def _set_lut(self, lut_dict):
+ def _set_lut(self):
  # Make sure we're not going to try to set more entries than we have slots
- if len(lut_dict) > 8:
+ if len(self.lut_values) > 8:
  raise AttributeError("LUT can only contain a maximum of 8 items")
 
  # Verify that the value is a correct amount
- for speed in lut_dict.values():
+ for speed in self.lut_values.values():
  if speed > 100.0 or speed < 0:
  raise AttributeError("LUT values must be a fan speed from 0-100%")
 
- # Copy to our internal representation
- self.lut_values = {k: v for k, v in lut_dict.items()}
+ # Backup state
  current_mode = self.emc_fan.lut_enabled
 
  # Disable the lut to allow it to be updated
  self.emc_fan.lut_enabled = False
 
  # we want to assign the lowest temperature to the lowest LUT slot, so we sort the keys/temps
  # get and sort the new lut keys so that we can assign them in order
- flat_list = []
  for idx, current_temp in enumerate(sorted(self.lut_values.keys())):
  current_speed = _speed_to_lsb(self.lut_values[current_temp])
- getattr(self, "_fan_lut_t%d" % (idx + 1)).__set__(self, current_temp)
- getattr(self, "_fan_lut_s%d" % (idx + 1)).__set__(self, current_speed)
-
- # self.emc_fan._lut_temp_setters[idx].__set__(self.emc_fan, current_temp)
- # self.emc_fan._lut_speed_setters[idx].__set__(self.emc_fan, current_speed)
+ setattr(self, "_fan_lut_t%d" % (idx + 1), current_temp)
+ setattr(self, "_fan_lut_s%d" % (idx + 1), current_speed)
 
  # Set the remaining LUT entries to the default (Temp/Speed = max value)
  for idx in range(8)[len(self.lut_values):]:
- getattr(self, "_fan_lut_t%d" % (idx + 1)).__set__(self, MAX_LUT_TEMP)
- getattr(self, "_fan_lut_s%d" % (idx + 1)).__set__(self, MAX_LUT_SPEED)
+ setattr(self, "_fan_lut_t%d" % (idx + 1), MAX_LUT_TEMP)
+ setattr(self, "_fan_lut_s%d" % (idx + 1), MAX_LUT_SPEED)
  self.emc_fan.lut_enabled = current_mode