From 16050cc1769054b4b7da10093be46cad73aee66f Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sun, 20 Oct 2019 13:35:29 +0200 Subject: [PATCH] rewrite the temperature collector after a quick test I don't think I need the complicated way to calculate the temperature --- sensors/collector/collector.py | 12 ++---------- sensors/collector/tests/test_collector.py | 8 ++++++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/sensors/collector/collector.py b/sensors/collector/collector.py index 41937f6..23b07dd 100644 --- a/sensors/collector/collector.py +++ b/sensors/collector/collector.py @@ -7,18 +7,10 @@ else: sense = SenseHat() -def _get_cpu_temperature(): - res = os.popen('vcgencmd measure_temp').readline() - return float(res.replace('temp=', '').replace("'C\n", '')) def get_temperature(): - humidity_temp = self._sense_hat.get_temperature_from_humidity() - pressure_temp = self._sense_hat.get_temperature_from_pressure() - cpu_temp = _get_cpu_temperature() - avg_temp = ((humidity_temp + pressure_temp) - / 2 if pressure_temp else humidity_temp) - adj_temp = avg_temp - (cpu_temp - avg_temp) / 0.69 - return adj_temp + raw_temp = sense.get_temperature() + return round(raw_temp, 1) def get_pressure(): diff --git a/sensors/collector/tests/test_collector.py b/sensors/collector/tests/test_collector.py index 0a28c2f..aa583fa 100644 --- a/sensors/collector/tests/test_collector.py +++ b/sensors/collector/tests/test_collector.py @@ -8,5 +8,9 @@ from collector import collector pytestmark=pytest.mark.django_db -def test_collector(): - print(str(collector.get_temperature())) +def test_temp_collector(monkeypatch): + def mock_temp(): + return 25.345 + + monkeypatch.setattr(collector.sense, 'get_temperature', mock_temp) + assert collector.get_temperature() == 25.3