Skip to content

Commit

Permalink
Fixed conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Aiky30 committed May 30, 2024
2 parents ad44ecd + 3644601 commit aa15bfc
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion standalone_modules/shed_pi_module_utils/tests/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ def submit_reading(self) -> requests.Response:
"""
reading = self.read_fake_data()

# FIXME: Should this be a float or a string? Broke the test
data = {"temperature": str(reading)}

response = self.submission_service.submit(
Expand Down
1 change: 0 additions & 1 deletion standalone_modules/temperature_module/temperature_probe.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
class TempProbe:
def __init__(self, submission_service: ReadingSubmissionService):
self.device_id: int = None
# TODO: Make this an env var, it can then be overridden by the tests
base_dir = "/sys/bus/w1/devices/"
device_folder = Path.glob(base_dir + "28*")[0]
self.device_file = device_folder + "/w1_slave"
Expand Down

0 comments on commit aa15bfc

Please sign in to comment.