Split washer and dryer class

cli_dryer_menu.py

@@ -18,31 +18,30 @@ def print_menu():
 
     def print_status(dr: Dryer):
         print(f"online: {dr.get_online()}")
-        print(f"state: {dr.get_machine_state_value()}")
-        print(f"door open: {dr.get_op_status_dooropen()}")
-        print(f"est time remaining: {dr.get_time_status_est_time_remaining()}")
-        print(f"extra power changeable: {dr.get_change_status_extrapowerchangeable()}")
-        print(f"steam changeable: {dr.get_change_status_steamchangeable()}")
-        print(f"cycle select: {dr.get_change_status_cycleselect()}")
-        print(f"dryness: {dr.get_change_status_dryness()}")
-        print(f"manual dry time: {dr.get_change_status_manualdrytime()}")
-        print(f"static guard: {dr.get_change_status_staticguard()}")
-        print(f"temperature: {dr.get_change_status_temperature()}")
-        print(f"wrinkle shield: {dr.get_change_status_wrinkleshield()}")
-        print(f"airflow status: {dr.get_cycle_status_airflow_status()}")
-        print(f"cool down: {dr.get_cycle_status_cool_down()}")
-        print(f"damp: {dr.get_cycle_status_damp()}")
-        print(f"drying: {dr.get_cycle_status_drying()}")
-        print(f"limited cycle: {dr.get_cycle_status_limited_cycle()}")
-        print(f"sensing: {dr.get_cycle_status_sensing()}")
-        print(f"static reduce: {dr.get_cycle_status_static_reduce()}")
-        print(f"steaming: {dr.get_cycle_status_steaming()}")
-        print(f"wet: {dr.get_cycle_status_wet()}")
-        print(f"cycle count: {dr.get_odometer_status_cycle_count()}")
-        print(f"running hours: {dr.get_odometer_status_running_hours()}")
-        print(f"total hours: {dr.get_odometer_status_total_hours()}")
-        print(f"isp check: {dr.get_wifi_status_isp_check()}")
-        print(f"rssi antenna diversity: {dr.get_wifi_status_rssi_antenna_diversity()}")
+        print(f"door open: {dr.get_door_open()}")
+        print(f"est time remaining: {dr.get_est_time_remaining()}")
+        print(f"extra power changeable: {dr.get_status_extra_power_changeable()}")
+        print(f"steam changeable: {dr.get_status_extra_steam_changeable()}")
+        print(f"cycle select: {dr.get_status_cycle_select()}")
+        print(f"dryness: {dr.get_status_dryness()}")
+        print(f"manual dry time: {dr.get_status_manual_dry_time()}")
+        print(f"static guard: {dr.get_status_static_guard()}")
+        print(f"temperature: {dr.get_status_temperature()}")
+        print(f"wrinkle shield: {dr.get_status_wrinkle_shield()}")
+        print(f"airflow status: {dr.get_airflow_status()}")
+        print(f"cool down: {dr.get_cool_down()}")
+        print(f"damp: {dr.get_damp()}")
+        print(f"drying: {dr.get_drying()}")
+        print(f"limited cycle: {dr.get_limited_cycle()}")
+        print(f"sensing: {dr.get_sensing()}")
+        print(f"static reduce: {dr.get_static_reduce()}")
+        print(f"steaming: {dr.get_steaming()}")
+        print(f"wet: {dr.get_wet()}")
+        print(f"cycle count: {dr.get_cycle_count()}")
+        print(f"running hours: {dr.get_running_hours()}")
+        print(f"total hours: {dr.get_total_hours()}")
+        print(f"isp check: {dr.get_isp_check()}")
+        print(f"rssi antenna diversity: {dr.get_rssi_antenna_diversity()}")
 
         print(f"set dryness: {dr.get_dryness()}")
         print(f"set manual dry time: {dr.get_manual_dry_time()}")

cli_washer_menu.py

@@ -19,12 +19,12 @@ def print_menu():
     def print_status(wr: Washer):
         print("online: " + str(wr.get_online()))
         print("state: " + str(wr.get_machine_state()))
-        print("sensing: " + str(wr.get_cycle_status_sensing()))
-        print("filling: " + str(wr.get_cycle_status_filling()))
-        print("soaking: " + str(wr.get_cycle_status_soaking()))
-        print("washing: " + str(wr.get_cycle_status_washing()))
-        print("rinsing: " + str(wr.get_cycle_status_rinsing()))
-        print("spinning: " + str(wr.get_cycle_status_spinning()))
+        print("sensing: " + str(wr.get_sensing()))
+        print("filling: " + str(wr.get_filling()))
+        print("soaking: " + str(wr.get_soaking()))
+        print("washing: " + str(wr.get_washing()))
+        print("rinsing: " + str(wr.get_rinsing()))
+        print("spinning: " + str(wr.get_spinning()))
 
     def attr_upd():
         print("Attributes updated")

tests/test_dryer.py

@@ -14,32 +14,31 @@
 async def test_attributes(appliances_manager: AppliancesManager):
     dryer1 = appliances_manager.dryers[0]
     assert dryer1.get_machine_state() == MachineState.Standby
-    assert dryer1.get_machine_state_value() == 0
-    assert dryer1.get_op_status_dooropen() is False
-    assert dryer1.get_time_status_est_time_remaining() == 1800
+    assert dryer1.get_door_open() is False
+    assert dryer1.get_est_time_remaining() == 1800
     assert dryer1.get_drum_light_on() == 0
-    assert dryer1.get_change_status_steamchangeable() == 1
-    assert dryer1.get_change_status_cycleselect() == 0
-    assert dryer1.get_change_status_dryness() == 1
-    assert dryer1.get_change_status_manualdrytime() == 1
-    assert dryer1.get_change_status_temperature() == 1
-    assert dryer1.get_change_status_wrinkleshield() == 1
+    assert dryer1.get_status_extra_steam_changeable() == 1
+    assert dryer1.get_status_cycle_select() == 0
+    assert dryer1.get_status_dryness() == 1
+    assert dryer1.get_status_manual_dry_time() == 1
+    assert dryer1.get_status_temperature() == 1
+    assert dryer1.get_status_wrinkle_shield() == 1
     assert dryer1.get_dryness() == 10
     assert dryer1.get_manual_dry_time() == 1800
     assert dryer1.get_cycle_select() == 11
-    assert dryer1.get_cycle_status_airflow_status() == 0
-    assert dryer1.get_cycle_status_cool_down() == 0
-    assert dryer1.get_cycle_status_damp() == 0
-    assert dryer1.get_cycle_status_drying() == 0
-    assert dryer1.get_cycle_status_limited_cycle() == 0
-    assert dryer1.get_cycle_status_sensing() == 0
-    assert dryer1.get_cycle_status_static_reduce() == 0
-    assert dryer1.get_cycle_status_steaming() == 0
-    assert dryer1.get_cycle_status_wet() == 0
-    assert dryer1.get_odometer_status_cycle_count() == 195
-    assert dryer1.get_odometer_status_running_hours() == 148
-    assert dryer1.get_odometer_status_total_hours() == 6302
-    assert dryer1.get_wifi_status_rssi_antenna_diversity() == -51
+    assert dryer1.get_airflow_status() == 0
+    assert dryer1.get_cool_down() == 0
+    assert dryer1.get_damp() == 0
+    assert dryer1.get_drying() == 0
+    assert dryer1.get_limited_cycle() == 0
+    assert dryer1.get_sensing() == 0
+    assert dryer1.get_static_reduce() == 0
+    assert dryer1.get_steaming() == 0
+    assert dryer1.get_wet() == 0
+    assert dryer1.get_cycle_count() == 195
+    assert dryer1.get_running_hours() == 148
+    assert dryer1.get_total_hours() == 6302
+    assert dryer1.get_rssi_antenna_diversity() == -51
     assert dryer1.get_damp_notification_tone_volume() == 0
     assert dryer1.get_alert_tone_volume() == 0
     assert dryer1.get_temperature() == 2