Update

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 # testing
-custom: ['https://money.yandex.ru/to/410011290807928']
+custom: ['https://yoomoney.ru/to/410011290807928']

README.md

@@ -1,24 +1,47 @@
 <div align="center">
     <img src="https://github.com/rand256/valetudo/blob/testing/assets/logo/valetudo_logo_with_name.svg" width="800" alt="valetudo">
-    <p align="center"><h2>Free your vacuum from the cloud</h2><h5>Supported devices: Roborock S5, Xiaomi Mi Robot Vacuum Cleaner (v1)</p>
+    <p>&nbsp;</p>
+    <h2>Free your vacuum from the cloud</h2>
+</div><div>
+    <h5>
+        Fully supported devices: Roborock S5 and Xiaomi Mi Robot Vacuum Cleaner (v1)<br>
+        Preliminary supported devices: Roborock S6 and other III-generation Roborock vacuums
+    </h5>
 </div>
 
 ----
 
 ### Preamble:
 
-This is a heavily modified version of [Valetudo by Hypfer](https://github.com/Hypfer/Valetudo), enhanced by me since I found too many features missing in the original package when I've tried to use it for the first time. Next is a quick list of changes first appeared here:
+This is a fork of [Valetudo by Hypfer](https://github.com/Hypfer/Valetudo), created by me since I found too many features missing in the original package when I've tried to use it for the first time. 
+
+Features added lately:
+* Preliminary support for Roborock gen3 devices;
+* MQTT: Tracking the time when the dustbin was last emptied or for how long it was in use;
+* MQTT: Possibility of playing sound files on the device by issuing a mqtt command;
+* Optional ability to see a live map on the Remote Control tab;
+
+
+And this is a quick list of features first appeared here:
 
 * Ability to select multiple saved zones at once;
 * Selected zones optionally shown at the map tab to see and edit what's actually going to be cleaned;
-* Configurable virtual walls and forbidden zones, finally! (requires Gen2)
+* Configurable virtual walls and forbidden zones (requires Gen2);
+* Ability to see the actual map of cleanings that were finished recently;
 * Scheduled zoned cleaning - when you do not need to clean the whole house;
+* Scheduled rooms cleaning - the same thing for newer firmware of Gen2;
 * Ability to specify the number of iterations to clean the same zone multiple times;
-* Showing device status on the map, and also dynamically switching buttons;
-* Experimental ability to save/restore maps;
-* Multilanguage support, currently available in bg/de/en/es/fi/fr/hu/it/nl/ru;
+* Display device's status on the map, as well as a set of quick action buttons that are dynamically switching at state changes;
+* Multilanguage support, currently available in bg/ca/cz/de/en/es/fi/fr/hu/it/lv/nl/ru/sv/pl;
 * A telegram bot software for controlling the vacuum from the outside world;
-* Full support of room cleaning (requires Gen2 with firmware 2008+).
+* Experimental ability to SAVE and RESTORE the main map (with per-map list of saved zones and spots);
+* Full support of room cleaning (requires Gen2 with firmware 2008+);
+* Cleaning queue, allowing the use of zoned cleaning with more than 5 zones via enqueuing any number of additional cleanups at once;
+* Possibility to enqueue additional zones and segments during cleaning or additional goto spots during the movement;
+* Ability to run Goto + Spot cleaning (by long pressing "Goto" button on the map tab);
+* Selecting the destination for the device to go when the cleaning is finished (configured globally in settings or per-cleaning by long pressing "Start" button on the map tab);
+* Visual preview and edit of zones and rooms for corresponding scheduled cleaning.
+
 
 You can add or improve your own native language support by using ./client/locales/en.json template as an example and sending a PR.
 
@@ -47,9 +70,6 @@ Check [deployment section](/deployment) or [this wiki page](https://github.com/r
 
 </details>
 
-### Join the Discussion
-* [Valetudo Telegram group](https://t.me/joinchat/AR1z8xOGJQwkApTulyBx1w)
-
 ### Getting map picture for integrations
-* [valetudo-mapper](https://github.com/rand256/valetudo-mapper) - a companion service for generating PNG Maps
+* [valetudo-mapper](https://github.com/rand256/valetudo-mapper) - a companion service for generating PNG maps;
 * You can also try to request a simple map from Valetudo RE itself via http at `/api/simple_map`, but it shouldn't be called too often since resources of the vacuum are limited.

client/about.html

@@ -8,19 +8,20 @@
 	<span style="text-align: center;">
 		<h3>Valetudo RE</h3>
 		<h5>free your vacuum from the cloud</h5>
+		<p>Based on <a href="https://github.com/Hypfer/Valetudo" target="_blank">Valetudo</a> - <em>Another IoT Smarthome Node.js</em> project by <a href="https://github.com/Hypfer" target="_blank">Hypfer</a></p>
+		<p>enhanced by <a href="https://github.com/rand256" target="_blank">rand256</a></p>
 		<p>
-			Based on <a href="https://github.com/Hypfer/Valetudo" target="_blank">Valetudo</a> - <em>Another IoT Smarthome Node.js</em> project by <a href="https://github.com/Hypfer" target="_blank">Hypfer</a><br/>
-			enhanced by <a href="https://github.com/rand256" target="_blank">rand256</a>
-		</p><p>
 			Thanks to all contributors:
 			<br/>
 			<a style="word-wrap:break-word;" href="https://github.com/rand256/valetudo/graphs/contributors" target="_blank">
 				https://github.com/rand256/valetudo/graphs/contributors
 			</a>
-			<br/>
-			<br/>
 		</p>
+		<link href="https://fonts.googleapis.com/css?family=Cookie" rel="stylesheet">
+		<p><a class="bmc-button" target="_blank" href="https://www.buymeacoffee.com/rand256"><ons-icon icon="fa-coffee" class="ons-icon fa-coffee fa"></ons-icon><span style="margin-left:10px;font-size:28px;">buy me a coffee</span></a></p>
+		<p><a class="bmc-button ym" target="_blank" href="https://yoomoney.ru/to/410011290807928"><svg width="129" height="27" viewBox="0 0 129 27" fill="none" xmlns="http://www.w3.org/2000/svg"><path class="ymbc" d="M24.5225 0C17.0035 0 11.0225 6.06646 11.0225 13.5C11.0225 21.019 17.0889 27 24.5225 27C31.956 27 38.0225 20.9335 38.0225 13.5C38.1079 6.06646 31.956 0 24.5225 0ZM24.5225 18.5411C21.7883 18.5411 19.4813 16.2342 19.4813 13.5C19.4813 10.7658 21.7883 8.45886 24.5225 8.45886C27.2566 8.45886 29.5636 10.7658 29.5636 13.5C29.5636 16.2342 27.3421 18.5411 24.5225 18.5411Z"></path><path class="ymbc" d="M11.0222 3.93005V23.5819H6.1519L0 3.93005H11.0222Z"></path><path class="ympc" d="M124.917 7.43433L121.926 14.7824C121.841 14.8679 121.841 15.0388 121.841 15.1242L121.755 15.2951L121.67 15.1242C121.67 15.0388 121.584 14.8679 121.584 14.7824L118.594 7.43433H114.749L119.79 19.9944L117.654 24.7793H121.499L128.591 7.43433H124.917Z"></path><path class="ympc" d="M96.5505 8.11703C95.867 7.60437 95.0125 7.2626 93.9872 7.17716C92.2784 7.00627 90.6549 7.60438 89.5442 8.71513V7.34805H86.041V19.9082H89.5442V13.3291C89.5442 11.8765 89.8005 11.4493 90.0568 11.1075C90.4841 10.424 91.253 10.0822 92.1929 10.0822C93.1328 10.0822 93.9872 10.5094 94.4144 11.193C94.6708 11.7056 94.7562 12.3892 94.7562 12.731C94.7562 13.8417 94.7562 19.9082 94.7562 19.9082H98.2594V12.3037C98.2594 10.3385 97.6613 8.97146 96.5505 8.11703Z"></path><path class="ympc" d="M79.3763 7.5197C77.6674 6.9216 75.7877 7.00704 74.0788 7.77603C72.9681 8.28869 71.9428 9.14312 71.3447 10.2539C70.7466 11.1937 70.4902 12.39 70.4902 13.6716C70.4902 14.9532 70.7466 16.1494 71.3447 17.0893C71.9428 18.0292 72.7117 18.8836 73.7371 19.3963C74.7624 19.9089 75.9586 20.2507 77.0693 20.2507C77.6674 20.2507 78.2655 20.1653 78.8637 19.9944C79.3763 19.8235 79.889 19.6526 80.4016 19.3963C81.4269 18.7982 82.2814 18.0292 82.794 17.0893C83.3921 16.1494 83.6485 14.9532 83.6485 13.6716C83.7339 10.852 82.1105 8.45957 79.3763 7.5197ZM80.4016 13.8425C80.3162 14.9532 79.9744 15.8931 79.2909 16.4912C78.7782 16.9184 78.0092 17.1748 77.0693 17.2602C76.1295 17.2602 75.4459 17.0039 74.8478 16.4912C74.1643 15.8931 73.8225 14.9532 73.7371 13.8425C73.6516 12.5608 74.1643 11.5355 75.1042 10.852C75.6168 10.5102 76.3004 10.2539 76.9839 10.2539C77.7529 10.2539 78.351 10.5102 78.9491 10.852C79.9744 11.4501 80.4871 12.5608 80.4016 13.8425Z"></path><path class="ympc" d="M66.4743 8.11712C65.7907 7.60446 64.9363 7.26269 63.911 7.17725C63.7401 7.17725 63.4838 7.17725 63.3129 7.17725C61.9458 7.17725 60.7496 7.77535 59.7243 8.97155L59.5534 9.22788H59.2116C58.9553 8.80066 58.6135 8.4589 58.2717 8.20257C57.5882 7.68991 56.7338 7.34813 55.7084 7.26269C54.085 7.0918 52.8034 7.60446 51.6926 8.80066V7.51902H48.1895V20.0791H51.6926V13.5V13.3291C51.6926 11.9621 51.8635 11.6203 52.1198 11.1931C52.5471 10.5095 53.316 10.0823 54.1705 10.1678C55.0249 10.1678 55.7939 10.595 56.2211 11.2785C56.5629 11.7912 56.5629 12.3893 56.5629 12.9874V19.9937H60.066V13.2437C60.066 11.9621 60.2369 11.5348 60.4933 11.1076C60.9205 10.4241 61.6895 10.0823 62.5439 10.0823C63.3983 10.0823 64.0819 10.5095 64.5091 11.1931C64.7654 11.6203 64.8508 12.1329 64.8508 12.4747C64.8508 12.6456 64.8508 12.8165 64.8508 12.9019V19.9083H68.354V12.2184C68.354 11.5348 68.2686 10.8513 68.0977 10.2532C67.7559 9.39876 67.2433 8.62978 66.4743 8.11712Z"></path><path class="ympc" d="M111.417 16.1494C110.904 16.662 109.708 17.6019 108.085 17.6873C106.718 17.7728 105.692 17.3456 104.923 16.5766C104.582 16.2348 104.325 15.7221 104.154 15.2095H113.809V15.124C113.895 14.6114 113.98 14.1842 113.98 13.6715C113.98 13.2443 113.895 12.6462 113.724 11.8772C113.297 10.4247 112.442 9.31392 111.332 8.45948C110.05 7.51961 108.854 7.26328 108.512 7.26328C106.034 6.83607 103.214 7.94682 101.762 10.2538C100.737 11.8772 100.822 13.5006 100.822 14.0133C100.822 14.6114 100.907 16.4911 102.445 18.2C104.24 20.1652 106.718 20.2506 107.487 20.3361C110.904 20.4215 113.211 18.2854 113.724 17.8582L111.417 16.1494ZM105.436 10.8519C105.949 10.5101 106.547 10.2538 107.316 10.2538C108.085 10.2538 108.683 10.5101 109.281 10.8519C109.794 11.2791 110.221 11.7918 110.477 12.3899H104.325C104.411 11.7918 104.838 11.1937 105.436 10.8519Z"></path></svg></a></p>
 	</span>
+	<style>.bmc-button img{height: 34px;width: 35px;margin-bottom: 1px;box-shadow: none;border: none;vertical-align: middle;}.bmc-button{padding: 7px 15px 7px 10px;line-height: 35px;height:51px;text-decoration: none;display:inline-flex;color:#000000;background-color:#FFFFFF;border-radius: 5px;border: 1px solid transparent;font-size: 28px;letter-spacing:0.6px;box-shadow: 0px 1px 2px rgba(190, 190, 190, 0.5);-webkit-box-shadow: 0px 1px 2px 2px rgba(190, 190, 190, 0.5);margin: 0 auto;font-family:'Cookie', cursive;-webkit-box-sizing: border-box;box-sizing: border-box;}.bmc-button:hover, .bmc-button:active, .bmc-button:focus {-webkit-box-shadow: 0px 1px 2px 2px rgba(190, 190, 190, 0.5);text-decoration: none;box-shadow: 0px 1px 2px 2px rgba(190, 190, 190, 0.5);opacity: 0.85;color:#000000;}.bmc-button.ym {padding: 11px;}.ympc {fill: black;}.ymbc {fill: #8b3ffd;}</style>
 	<script>
 		ons.getScriptPage().onInit = function() {
 			fn.localize('#about-page');