Merge branch 'release' into dev_fedorov
# Conflicts: # Version.toml # app/auto/controller.py
This commit is contained in:
@@ -1,8 +1,16 @@
|
|||||||
[version]
|
[version]
|
||||||
major = 1
|
major = 1
|
||||||
minor = 5
|
minor = 5
|
||||||
|
<<<<<<< HEAD
|
||||||
patch = 0
|
patch = 0
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
date = "2026-09-27"
|
date = "2026-09-27"
|
||||||
time = "20:00:55"
|
time = "20:00:55"
|
||||||
|
=======
|
||||||
|
patch = 1
|
||||||
|
|
||||||
|
[build]
|
||||||
|
date = "2026-09-27"
|
||||||
|
time = "20:06:04"
|
||||||
|
>>>>>>> release
|
||||||
|
|||||||
@@ -269,7 +269,7 @@ class AutoController:
|
|||||||
|
|
||||||
await self._set_speed(fallback_speed)
|
await self._set_speed(fallback_speed)
|
||||||
|
|
||||||
self._update_elica_assist(fallback_speed)
|
await self._update_elica_assist(fallback_speed)
|
||||||
|
|
||||||
if self._temperature_policy is not None:
|
if self._temperature_policy is not None:
|
||||||
await self._process_heater(
|
await self._process_heater(
|
||||||
|
|||||||
Reference in New Issue
Block a user