fix: update set_current to work with older firmware (#40)

* fix: update set_current to work with older firmware

* tests: add test for set_current on old firmware

* tests: formatting

Author: firstof9

openevsehttp/__init__.py

@@ -444,24 +444,36 @@ async def clear_override(self) -> None:
 
     async def set_current(self, amps: int = 6) -> None:
         """Set the soft current limit."""
-        url = f"{self.url}config"
-
-        if (
-            amps < self._config["min_current_hard"]
-            or amps > self._config["max_current_hard"]
-        ):
-            _LOGGER.error("Invalid value for max_current_soft: %s", amps)
-            raise ValueError
+        #   3.x - 4.1.0: use RAPI commands $SC <amps>
+        #   4.1.2: use HTTP API call
 
-        data = {"max_current_soft": amps}
+        cutoff = AwesomeVersion("4.1.2")
+        current = AwesomeVersion(self._config["version"])
 
-        _LOGGER.debug("Setting max_current_soft to %s", amps)
-        response = await self.process_request(
-            url=url, method="post", data=data
-        )  # noqa: E501
-        if response["msg"] != "done":
-            _LOGGER.error("Problem issuing command: %s", response["msg"])
-            raise UnknownError
+        if cutoff <= current:
+            url = f"{self.url}config"
+
+            if (
+                amps < self._config["min_current_hard"]
+                or amps > self._config["max_current_hard"]
+            ):
+                _LOGGER.error("Invalid value for max_current_soft: %s", amps)
+                raise ValueError
+            data = {"max_current_soft": amps}
+
+            _LOGGER.debug("Setting max_current_soft to %s", amps)
+            response = await self.process_request(
+                url=url, method="post", data=data
+            )  # noqa: E501
+            if response["msg"] != "done":
+                _LOGGER.error("Problem issuing command: %s", response["msg"])
+                raise UnknownError
+        else:
+            # RAPI commands
+            _LOGGER.debug("Setting current via RAPI")
+            command = f"$SC {amps}"
+            response = await self.send_command(command)
+            _LOGGER.debug("Set current response: %s", response[1])
 
     @property
     def hostname(self) -> str:

setup.py

@@ -5,7 +5,7 @@
 
 PROJECT_DIR = Path(__file__).parent.resolve()
 README_FILE = PROJECT_DIR / "README.md"
-VERSION = "0.1.16"
+VERSION = "0.1.17"
 
 setup(
     name="python-openevse-http",

tests/fixtures/v4_json/config.json

@@ -3,7 +3,7 @@
     "protocol": "-",
     "espflash": 4194304,
     "wifi_serial": "1234567890AB",
-    "version": "4.0.0",
+    "version": "4.1.2",
     "diodet": 0,
     "gfcit": 0,
     "groundt": 0,

tests/test_init.py

@@ -186,7 +186,7 @@ async def test_get_service_level(fixture, expected, request):
 
 
 @pytest.mark.parametrize(
-    "fixture, expected", [("test_charger", "4.0.0"), ("test_charger_v2", "2.9.1")]
+    "fixture, expected", [("test_charger", "4.1.2"), ("test_charger_v2", "2.9.1")]
 )
 async def test_get_wifi_firmware(fixture, expected, request):
     """Test v4 Status reply"""
@@ -650,3 +650,17 @@ async def test_set_current_error(test_charger, mock_aioclient, caplog):
         with pytest.raises(ValueError):
             await test_charger.set_current(60)
     assert "Invalid value for max_current_soft: 60" in caplog.text
+
+
+async def test_set_current_v2(test_charger_v2, mock_aioclient, caplog):
+    """Test v4 Status reply"""
+    await test_charger_v2.update()
+    value = {"cmd": "OK", "ret": "$OK^20"}
+    mock_aioclient.post(
+        TEST_URL_RAPI,
+        status=200,
+        body=json.dumps(value),
+    )
+    with caplog.at_level(logging.DEBUG):
+        await test_charger_v2.set_current(12)
+    assert "Setting current via RAPI" in caplog.text