Skip to content

Commit

Permalink
Merge branch 'feature/environment-change-intensity-name' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
boobooboo2 committed Dec 18, 2024
2 parents eeb35b9 + 4fb1e21 commit 1342444
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions modi_plus/module/input_module/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ class Env(InputModule):
PROPERTY_OFFSET_VOLUME = 6

@property
def intensity(self) -> int:
"""Returns the value of intensity between 0 and 100
def illuminance(self) -> int:
"""Returns the value of illuminance between 0 and 100
:return: The environment's intensity.
:return: The environment's illuminance.
:rtype: int
"""

Expand Down
4 changes: 2 additions & 2 deletions modi_plus/util/inspection_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,13 @@ def inspect_battery(self, module, i, nb_modules):
def inspect_env(self, module, i, nb_modules):
self.print_wrap(
"""
Environment module has intensity, temperature, humidity and volume as its property.
Environment module has illuminance, temperature, humidity and volume as its property.
"""
)
input("\nIf you are ready to inspect this module, Press ENTER: ")
self.clear()

properties = ["intensity", "temperature", "humidity", "volume"]
properties = ["illuminance", "temperature", "humidity", "volume"]

for prop in properties:
self.print_module_page(module, i, nb_modules)
Expand Down
2 changes: 1 addition & 1 deletion modi_plus/util/usage_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def run_env_manual(self):
env = bundle.envs[0]
while True:
print(f"Env ({env.id}) intensity: {env.intensity}")
print(f"Env ({env.id}) illuminance: {env.illuminance}")
print(f"Env ({env.id}) temperature: {env.temperature}")
print(f"Env ({env.id}) humidity: {env.humidity}")
print(f"Env ({env.id}) volume: {env.volume}")
Expand Down

0 comments on commit 1342444

Please sign in to comment.