Correcting merge

Author: prestoncarman

src/devices/eeprom.py

@@ -13,6 +13,7 @@ def __init__(self):
         The constructor function for the EEPROM class
         """
         self._google_sheet_interval = 20
+        self._ignore_bad_ph_slope = False
         self._kd_value = 36.0
         self._ki_value = 28.0
         self._kp_value = 20.0
@@ -26,6 +27,14 @@ def get_google_sheet_interval(self, default):
             return default
         return self._google_sheet_interval
 
+    def get_ignore_bad_ph_slope(self, default):
+        """
+        Get the ignore bad pH slope setting from EEPROM
+        """
+        if self._ignore_bad_ph_slope is None:
+            return default
+        return self._ignore_bad_ph_slope
+
     def get_kd(self, default):
         """
         Get the Kd value from EEPROM
@@ -64,6 +73,12 @@ def set_google_sheet_interval(self, value):
         """
         self._google_sheet_interval = value
 
+    def set_ignore_bad_ph_slope(self, value):
+        """
+        Set the ignore bad pH slope setting in EEPROM
+        """
+        self._ignore_bad_ph_slope = value
+
     def set_kd(self, value):
         """
         Set the Kd value in EEPROM

tests/devices/eeprom_test.py

@@ -31,6 +31,32 @@ def test_set_google_sheet_interval():
     assert eeprom.get_google_sheet_interval(65535) == 60
 
 
+def test_default_ignore_bad_ph_slope_value():
+    """
+    The function to test the default ignore_bad_ph_slope value
+    """
+    eeprom = EEPROM()
+    assert eeprom.get_ignore_bad_ph_slope(True) is False
+
+
+def test_save_ignore_bad_ph_slope_value():
+    """
+    The function to test setting the ignore_bad_ph_slope value
+    """
+    eeprom = EEPROM()
+    eeprom._ignore_bad_ph_slope = True
+    assert eeprom.get_ignore_bad_ph_slope(False) is True
+
+
+def test_set_ignore_bad_ph_slope():
+    """
+    The function to test setting the ignore_bad_ph_slope via setter
+    """
+    eeprom = EEPROM()
+    eeprom.set_ignore_bad_ph_slope(True)
+    assert eeprom.get_ignore_bad_ph_slope(False) is True
+
+
 def test_pid_values():
     """
     The function to test the PID values
@@ -92,19 +118,3 @@ def test_set_tank_id():
     eeprom.set_tank_id(10)
     assert eeprom.get_tank_id(0) == 10
 
-
-def test_thermal_correction_value():
-    """
-    The function to test the default thermal_correction_address value
-    """
-    eeprom = EEPROM()
-    assert eeprom.get_thermal_correction(0.0) == 12
-
-
-def test_save_thermal_correction_value():
-    """
-    The function to test setting the thermal_correction_address value
-    """
-    eeprom = EEPROM()
-    eeprom._thermal_correction = 2.5
-    assert eeprom.get_thermal_correction(0.0) == 2.5