Skip to content

Commit a6b9315

Browse files
ziimaziima
committed
Add support for warnings and filter reset
1 parent dd4069a commit a6b9315

File tree

3 files changed

+42
-0
lines changed

3 files changed

+42
-0
lines changed

‎recuair_cli/main.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
recuair-cli [options] bypass <device>...
88
recuair-cli [options] light <intensity> <red> <green> <blue> <device>...
99
recuair-cli [options] light off <device>...
10+
recuair-cli [options] reset-filters <device>...
1011
recuair-cli -h | --help
1112
recuair-cli --version
1213
@@ -17,6 +18,7 @@
1718
holiday set holiday mode
1819
bypass set bypass mode
1920
light change light
21+
reset-filters reset filter counter after filter change
2022
2123
Options:
2224
-h, --help show this help message and exit
@@ -71,6 +73,7 @@ class Status(NamedTuple):
7173
filter: int
7274
fan: int
7375
light: int
76+
warnings: list[str] = []
7477

7578

7679
def _strip_unit(value: str) -> str:
@@ -123,6 +126,8 @@ async def get_status(client: httpx.AsyncClient, device: str) -> Status:
123126
.partition("%")[0]
124127
)
125128
light_raw = cast(str, cast(Tag, container.find(id="myRange"))["value"])
129+
warnings_wrapper = container.find(id="errorModal").find_all(class_="modalText")[0]
130+
warnings = [d.find(string=True) for d in warnings_wrapper.find_all("div", recursive=False)[1:]]
126131

127132
return Status(
128133
device=device,
@@ -135,6 +140,7 @@ async def get_status(client: httpx.AsyncClient, device: str) -> Status:
135140
filter=100 - int(_strip_unit(filter_raw)),
136141
fan=100 - int(_strip_unit(fan_raw)),
137142
light=int(light_raw),
143+
warnings=warnings,
138144
)
139145
except Exception as error:
140146
# XXX: Recuair sometimes return incorrectly formatted response.
@@ -193,6 +199,8 @@ async def _run(options: dict[str, str]) -> None: # noqa: C901
193199
"intensity": options["<intensity>"],
194200
}
195201
coros.append(_wrap_retry(post_request)(client, device, data))
202+
elif options["reset-filters"]:
203+
coros.append(_wrap_retry(post_request)(client, device, {"filterNotification": "1"}))
196204
else:
197205
coros.append(_wrap_retry(get_status)(client, device))
198206

‎recuair_cli/tests/data/warning.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<!DOCTYPE html> <html> <head> <title>DC40 Holly</title> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="stylesheet" href="https://recuair.enobis.eu/ws_files/dc40.css"><link rel="stylesheet" href="https://recuair.enobis.eu/ws_files/icons.css?=2.05"> <style>.logo_i{display:block}</style> <link rel="icon" type="image/svg+xml" href="data:image/svg+xml,%3Csvg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='0%200%20128%20128'%20xml:space='preserve'%3E%3Cpath%20fill='%23fff'%20d='M0%200h128v128H0z'/%3E%3Cpath%20d='M104.5%2087.1C91.8%2082%2079.2%2085.3%2067%2088.4c-11.9%203.1-23.2%206-34.3%201.3l-.5-.2-1.4%2018.4.4.2a38%2038%200%200%200%2014.3%202.6%2092%2092%200%200%200%2023-4c11.7-3%2022.8-6%2033.8-1.5l1.2.4%201.4-18.3-.5-.2zM60.3%2073.3c11.7-3%2022.8-6%2033.8-1.6l1.2.4%201.4-18.3-.5-.2c-12.7-5.1-25.3-1.9-37.4%201.3-11.9%203.1-23.2%206-34.3%201.3L24%2056l-1.4%2018.4.4.1c4.8%202%209.5%202.7%2014.3%202.7%207.8%200%2015.5-2%2023-4zM45.5%2043.7a92%2092%200%200%200%2023-4c11.8-3%2022.9-5.9%2033.8-1.5l1%20.3%201.4-18.3-.2-.1c-12.7-5-25.3-1.8-37.4%201.3-11.9%203.1-23.2%206-34.3%201.3l-.6-.2-1.4%2018.3.5.3c4.7%202%209.5%202.6%2014.2%202.6z'%20fill='%23007337'/%3E%3C/svg%3E"></head> <body> <div class="container"> <div class="row dcContainer navbarTop"> <div class="col-xs-10" style="width: 73%;display: inline-block;"> <a href="/" id="homepageLogo" class="logo_main"> </a> </div> <div class="col-2" style="width: 17%;display: inline;"> <a href="javascript:void(0)" id="configBtn" onclick="showModal('configModal');getWifiList();"> <div class="logo_setting"></div> </a> </div> </div> <div class="row dcContainer" style="padding: 21px 0 0 0"> <div class="col-xs-6" style="padding-left: 23px;padding-bottom: 20px;width:50%;display: inline-block;"> <div class="logo_dc40"></div> <div id="deviceVersion">HP</div><span class="deviceName">Holly</span> </div> <div id="mainBar" class="col-xs-6" style="display: inline;width: 50%;"> <a href="javascript:void(0)" onclick="showModal('errorModal')"><svg xmlns="http://www.w3.org/2000/svg" width="31" height="24.474" viewBox="0 0 31 24.474"><defs><style>.a1{fill:#e00;}.b1{fill:#fff;stroke:#e00;}.c1{stroke:none;}.d1{fill:none;}</style></defs><g transform="translate(0 -31)"><path class="a1" d="M3.043,55.474a3.04,3.04,0,0,1-1.224-.253,3,3,0,0,1-.965-.673,3.066,3.066,0,0,1-.629-.965,2.98,2.98,0,0,1,.235-2.73L11.332,32.437l.008-.013A3.03,3.03,0,0,1,13.915,31h.016a3.03,3.03,0,0,1,2.575,1.425l.008.013L23.446,44.18h0a.544.544,0,0,1-.468.82.547.547,0,0,1-.469-.268L15.583,33a1.967,1.967,0,0,0-3.318,0L1.394,51.412l-.008.013a1.9,1.9,0,0,0-.3,1.018,1.964,1.964,0,0,0,.55,1.351,1.925,1.925,0,0,0,1.41.592H24.8a1.924,1.924,0,0,0,1.41-.592,1.963,1.963,0,0,0,.551-1.351,1.9,1.9,0,0,0-.3-1.018l-.007-.013L25,48.949a.544.544,0,0,1,.468-.82.546.546,0,0,1,.469.267l1.452,2.459a2.979,2.979,0,0,1,.234,2.728,3.058,3.058,0,0,1-.629.965,2.987,2.987,0,0,1-.965.673,3.049,3.049,0,0,1-1.224.253Z" transform="translate(0)"/><path class="a1" d="M72.754,100.035H51.544a.544.544,0,0,1-.468-.821L61.681,81.267a.544.544,0,0,1,.936,0L73.223,99.215a.544.544,0,0,1-.468.821ZM52.5,98.947H71.8L62.149,82.613Z" transform="translate(-48.226 -47.281)"/><path class="a1" d="M227.632,333.263a1.632,1.632,0,1,1,1.632-1.632A1.633,1.633,0,0,1,227.632,333.263Zm0-2.175a.544.544,0,1,0,.544.544A.544.544,0,0,0,227.632,331.088Z" transform="translate(-213.709 -282.739)"/><path class="a1" d="M227.632,193.69c-.6,0-.835-.692-.937-.987a10.849,10.849,0,0,1-.366-1.489,19.9,19.9,0,0,1-.328-2.582,1.632,1.632,0,1,1,3.263,0,19.906,19.906,0,0,1-.328,2.582,10.854,10.854,0,0,1-.366,1.489C228.467,193,228.228,193.69,227.632,193.69Zm0-5.6a.544.544,0,0,0-.544.544,18.638,18.638,0,0,0,.256,2.087,13.442,13.442,0,0,0,.287,1.337,13.444,13.444,0,0,0,.287-1.337,18.638,18.638,0,0,0,.256-2.087A.544.544,0,0,0,227.632,188.088Z" transform="translate(-213.709 -147.516)"/><circle class="a1" cx="0.544" cy="0.544" r="0.544" transform="translate(23.677 46.021)"/></g> <g class="b1" transform="translate(18 0.474)"><circle class="c1" cx="6.5" cy="6.5" r="6.5"/><circle class="d1" cx="6.5" cy="6.5" r="6"/></g><foreignObject fill="" stroke-dashoffset="" fill-rule="nonzero" font-size="100" font-family="Georgia, serif" letter-spacing="0" word-spacing="0" marker-start="" marker-mid="" marker-end="" id="svg_11" x="9" y="5" width="20" height="18" style="color: rgb(0, 0, 0);" class=""><p xmlns="http://www.w3.org/1999/xhtml">text</p></foreignObject><foreignObject class="errorCount" stroke="#000000" stroke-dashoffset="" fill-rule="nonzero" font-size="11" font-family="Georgia, serif" letter-spacing="0" word-spacing="0" marker-start="" marker-mid="" marker-end="" id="svg_15" x="21.5" y="1.5" width="10" height="10" style="color: #e00;" class="selected"><p xmlns="http://www.w3.org/1999/xhtml" style="font-family:Arial;border: none;outline: none;font-size: inherit;line-height: 1em;padding:0;margin:0;">1</p></foreignObject></svg> </svg></a> <a href="javascript:postForm( {mode:'1'}, '/' , '');"> <div class="logo_switch"></div> </a> </div> <div class="col-xs-12 navbar-nav navText" style="padding: 0;margin:0"> <div class="col-xs-6 active" style="box-sizing: border-box;display:inline-block;width:50%"><a href="/">Náhled</a></div><div class="col-xs-6" style="box-sizing: border-box;display:inline-block;width:50%;"><a href="/setting">Ovládání jednotky</a></div> </div> </div> <div class="row dcContainer backgroundImage" style="padding: 13px;"> <div class="col-12"> <span>Teplota <button class="btn infoBtn" onclick="showModal('temparatureModal')"><i class="logo_i"></i></button></span> </div> <div class="col-12" style="margin-bottom: 20px"> <span class="bigText"><i class="logo_termo_1"></i> - °C / - % <i class="logo_termo_2"></i> - °C </span> </div> <div class="col-12"> <span>Režim <button class="btn infoBtn" onclick="showModal('regimeModal')"><i class="logo_i"></i></button></span> </div> <div class="col-12" style="margin: 6px 0"> <span class="bigText"> Off </span> </div><form action="/" method="POST"> <div class="col-xs-12"> <span>Intenzita <button class="btn infoBtn modals" onclick="event.preventDefault();showModal('intensityModal')"><i class="logo_i"></i></button></span> </div> <div class="col-xs-12 customSlider"> <div class="row"> <div class="col-1 logo_bulb_1"></div> <div class="col-xs-10" style="position: relative;"> <span id="rangeVal"></span> <input type="range" name="intensity" min="0" max="5" value="0" step="1" id="myRange" oninput="slider(this)" onchange="postForm( {r: 255, g: 110, b: 20,intensity:this.value}, '/' , '');"> <br> <span class="first">0</span> <span class="second">5</span> </div> <div class="col-1 logo_bulb_2"> </div> </div> </div> </form><div class="col-12"> <span>Čidlo CO<sub>2</sub> <button class="btn infoBtn" onclick="showModal('co2Modal')"><i class="logo_i"></i></button></span><b style="padding-left:10px">- ppm</b> </div> <div class="col-12"> <div class="bigText coText"> <div class="col-12 filterBox" style="background:rgba(14,185,60,1)!important"> <div style="width: 100%"> </div> </div> </div> </div> <div class="col-12"> <span>Stav filtru <button class="btn infoBtn" onclick="showModal('filterModal')"><i class="logo_i"></i></button></span> </div> <div class="col-12 filterBox" style="background:rgba(204,182,14,1)!important"> <div style="width: 0%"> </div> </div> <div id="filterMessage" class="col-12"> </div> <div class="col-12"> <span>Intenzita větrání </span></div><div class="col-12"> <div class="bigText coText"> <div class="col-12 filterBox" style="background:rgba(14,185,60,1)!important"> <div style="width: 100%;"> </div> </div> </div> </div><script>function slider(that){ let el = document.getElementById('rangeVal'); el.innerHTML = that.value;el.style.left = ((that.value * 20)) + '%' ; el.style.display = "block";console.log(that.value) }</script> <!-- Regime Modal --> <div class="modal" id="regimeModal" tabindex="-1" role="dialog"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title"><i class="logo_i"></i></h5> <button type="button" class="btn close" data-dismiss="modal" aria-label="Close" onclick="document.getElementById('regimeModal').style.display = 'none'"> X </button> </div> <div class="modal-body"> <h5>Režim</h5> <div class="col-xs-12 modalText"> Zvolená síla větrání. Můžete změnit na kartě „Nastavení jednotky </div> </div> </div> </div> </div> <!-- Color Modal --> <div class="modal" id="colorModal" tabindex="-1" role="dialog"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title"><i class="logo_i"></i></h5> <button type="button" class="btn close" data-dismiss="modal" aria-label="Close" onclick="document.getElementById('colorModal').style.display = 'none'"> X </button> </div> <div class="modal-body"> <h5>Barva</h5> <div class="col-xs-12 modalText"> Vámi zvolená barva náladového osvětlení. Můžete změnit na kartě „Nastavení jednotky </div> </div> </div> </div> </div> <!-- Intensity Modal --> <div class="modal" id="intensityModal" tabindex="-1" role="dialog"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title"><i class="logo_i"></i></h5> <button type="button" class="btn close" data-dismiss="modal" aria-label="Close" onclick="document.getElementById('intensityModal').style.display = 'none'"> X </button> </div> <div class="modal-body"> <h5>Intenzita</h5> <div class="col-xs-12 modalText"> Intenzita osvětlení v pěti stupních se hodí pro větší, či menší přisvícení. Cesta na toaletu v noci bude tak zase o kousek bezpečnější. </div> </div> </div> </div> </div> <!-- Temparature Modal --> <div class="modal" id="temparatureModal" tabindex="-1" role="dialog"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title"><i class="logo_i"></i></h5> <button type="button" class="btn close" data-dismiss="modal" aria-label="Close" onclick="document.getElementById('temparatureModal').style.display = 'none'"> X </button> </div> <div class="modal-body"> <h5>Teplota</h5> <div class="col-xs-12 modalText"> Teplota v místnosti a venku. </div> </div> </div> </div> </div> <!-- Setting regime Modal --> <div class="modal" id="SetRegimeModal" tabindex="-1" role="dialog"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title"><i class="logo_i"></i></h5> <button type="button" class="btn close" data-dismiss="modal" aria-label="Close" onclick="document.getElementById('SetRegimeModal').style.display = 'none'"> X </button> </div> <div class="modal-body"> <h5>Režim</h5> <div class="col-xs-12 modalText"> <b>1,2,3,4:</b> pro manuální nastavení intenzity větrání. Ručně můžete zvolit dle vlastní potřeby sílu větrání. Obvyklé průběžné větrání je na stupeň 2-3. <br/><b>AUTO:</b> Jednotka automaticky volí intenzitu větrání dle hodnoty a vývoje CO2. <br/><b>HOLIDAY:</b> Jednotka provětrá místnost jedenkrát za 24 hodin. Aktivujte při odchodu na delší dobu/dovolenou. Prevence zatuchlosti. <br/><b>BYPASS:</b> obtok výměníku, jednotka větrá bez rekuperace tepla. <b>Bypass pasivně přichlazuje a zpříjemňuje vaše obydlí v době, kdy je venku chladněji. Funguje plně automaticky, lze nastavit i ručně. (při venkovní teplotě nad 15°C.)</b> </div> </div> </div> </div> </div> <!-- Setting color Modal --> <div class="modal" id="SetColorModal" tabindex="-1" role="dialog"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title"><i class="logo_i"></i></h5> <button type="button" class="btn close" data-dismiss="modal" aria-label="Close" onclick="document.getElementById('SetColorModal').style.display = 'none'"> X </button> </div> <div class="modal-body"> <h5>Barva</h5> <div class="col-xs-12 modalText"> Devět přednastavených barev, pro příjemné doladění nálady v interiéru a vaši bezpečnost při nočním pohybu bytem. Desátá barva je volitelná dle vašich požadavků. Zadejte hodnoty R, G, B, a potvrďte kolečkem +.<br/><b>POZOR! Barva na RGB páskách se nemusí opticky shodovat s barvou na displeji.</b> </div> </div> </div> </div> </div> <!-- Filter Modal --> <div class="modal" id="filterModal" tabindex="-1" role="dialog"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title"><i class="logo_i"></i></h5> <button type="button" class="btn close" data-dismiss="modal" aria-label="Close" onclick="document.getElementById('filterModal').style.display = 'none'"> X </button> </div> <div class="modal-body"> <h5>Stav filtru</h5> <div class="col-xs-12 modalText"> Pro správnou funkci větrání měňte filtry po cca 4 měsících aktivního provozu. Barevný indikátor vám napoví. Zelená: OK, Žlutá: blíží se konec životnosti, objednejte filtry, Červená: konec životnosti, vyměňte filtry. Filtry jsou důležitou součástí bezchybného provozu zařízení. Aby čistý vzduch byl skutečně čistý, mějte vždy v zásobě náhradní sadu filtrů. Objednávejte u svého dodavatele, nebo cez <a href="https://www.recuair.com/kontakty/">formulář</a> </div> </div> </div> </div> </div> <!-- co2 Modal --> <div class="modal" id="co2Modal" tabindex="-1" role="dialog"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title"><i class="logo_i"></i></h5> <button type="button" class="btn close" data-dismiss="modal" aria-label="Close" onclick="document.getElementById('co2Modal').style.display = 'none'"> X </button> </div> <div class="modal-body"> <h5>Čidlo CO<sub>2</sub></h5> <div class="col-xs-12 modalText"> Aktuální množství CO2. V budovách je běžné množství CO2 mezi 500 a 1500ppm. Jednotka průběžně odvětrává podle CO2 tak, aby hladina CO2 dlouhodobě nepřesahovala 1500ppm </div> </div> </div> </div> </div> <!-- Error Modal --> <div class="modal" id="errorModal" tabindex="-1" role="dialog"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title">Warning</h5> <button type="button" class="btn close" data-dismiss="modal" aria-label="Close" onclick="document.getElementById('errorModal').style.display = 'none'"> X </button> </div> <div class="modal-body"> <div class="col-xs-12 modalText"> <div class="arrows"> <a onclick="pageLeft()" id="leftArrow">&lt;</a> <a onclick="pageRight()" id="rightArrow">></a> </div> <div id='errorModal0' style='display:none'>N3: Filtry - KONEC životnosti, prosím vyměňte filtry<div class="col-xs-12 settingBtn"> <a class="btn" href="javascript:postForm( {filterNotification: 1}, '/setting' , '');" style="cursor:pointer">Vyřešeno</a> </div></div> </div> </div> </div> </div> </div> <!-- Config Modal --> <div class="modal" id="configModal" tabindex="-1" role="dialog"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> <h5></h5> <button type="button" class="btn close" data-dismiss="modal" aria-label="Close" onclick="document.getElementById('configModal').style.display = 'none'"> X </button> </div> <div class="modal-body configModalText"><form id="changeForm" action="/" method="POST"> <div class="col-xs-12 configModalText"> <div class="col-xs-12"> <input type="text" name="deviceName" value="Holly" placeholder="Název jednotky" > </div> <div class="col-xs-12"> <input type="text" name="ssid" id="wifiInput" value="Red Dwarf" placeholder="SSID" autocomplete="off"><br><select id="wifiList" style="z-index:1;margin:0 auto"><option value="">loading...</option></select> </div> <div class="col-xs-12"> <input id="password" type="password" name="password" value="Gazpacho!" placeholder="Heslo"><i class="bi bi-eye-slash" style="position:absolute;margin: 2px 0 0 -24px" id="togglePassword"></i> </div> <input type="text" name="socket" value="" placeholder="Socket server"> </div> <div class="settingBtn" style="margin-bottom: 10px"> <input type="submit" name="submit" value="Uložit"> </div> </form> <a href="https://www.recuair.com/decentralni-jednotky/" target="_blank">MANUÁL</a><br> <button class="active">CZ</button><button onclick="postForm( {language: 'en'}, '/' , '');">EN</button><button onclick="postForm( {language: 'de'}, '/' , '');">DE</button> </div> <div class="col-xs-12 settingBtn"><div style='font-size: 15px;font-family: ArialMT, Arial;letter-spacing: 0.058em;color: #3B3B3B;text-align: center;'>ws:2.05 fw:13.4</div> <a href="/upgrade" class="btn" style="margin-top: 12px;">Upgrade systému </a> </div><div class="col-xs-12 settingBtn" style="margin: -35px 0 40px 0;"> <a class="btn" style="cursor:default!important">25.5.2025 9:49:35</a> </div> </div> </div> </div> </div> </div> <script> let errorCount = 1;</script> <script src="https://recuair.enobis.eu/ws_files/dc40.js?v=2.05"></script> </body> </html>

0 commit comments

Comments
 (0)