image_builder: fix Monkey repository URL

image_builder: fix pack 4

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+
+[*.{py,cpp,h,swift,launch}]
+indent_style = space
+indent_size = 4
+
+[*.{js,html}]
+indent_style = tab

.gitattributes

@@ -0,0 +1,2 @@
+apps/ios/cleverrc/roslib.js linguist-vendored
+apps/ios/cleverrc/BinUtils.swift linguist-vendored

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "clever/static"]
-	path = clever/static
-	url = https://github.com/CopterExpress/clever-rc.git
-	branch = build

.markdownlint.json

@@ -0,0 +1,22 @@
+{
+    "MD003": false,
+    "MD013": false,
+    "MD033": false,
+    "MD034": false,
+    "MD044": {
+        "names": [
+            "MAVLink",
+            "ROS",
+            "Python",
+            "C++",
+            "PX4",
+            "WireShark",
+            "Wi-Fi",
+            "Raspberry Pi",
+            "PixHawk",
+            "PixRacer",
+            "ArUco"
+        ],
+        "code_blocks": false
+    }
+}

LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Copter Express
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,62 +1,69 @@
-Клевер
-======
+# CLEVER
 
-<img src="assets/clever.jpg" align="right" width="300px" alt="Клевер">
+<img src="docs/assets/clever3.png" align="right" width="300px" alt="CLEVER drone">
 
-«Клевер» — это учебный конструктор программируемого квадрокоптера, состоящего из популярных открытых компонентов, а также набор необходимой документации и библиотек для работы с ним.
+CLEVER is an educational programmable drone kit consisting of an unassembled quadcopter, open source software and documentation. The kit includes Pixhawk/Pixracer autopilot running PX4 firmware, Raspberry Pi 3 as companion computer, a camera for computer vision navigation as well as additional sensors and peripheral devices.
 
-Набор включает в себя полетный контроллер PixHawk/PixRacer с полетным стеком PX4, Raspberry Pi 3 в качестве управлящего бортового компьютера, модуль камеры для реализации полетов с использованием компьютерного зрения, а также набор различных датчиков и другой периферии.
+Copter Express has implemented a large number of different autonomous drone projects using exactly the same platform: [automated pizza delivery](https://www.youtube.com/watch?v=hmkAoZOtF58) in Samara and Kazan, coffee delivery in Skolkovo Innovation Center, [autonomous quadcopter with charging station](https://www.youtube.com/watch?v=RjX6nUqw1mI) for site monitoring and security, winning drones on [Robocross-2016](https://www.youtube.com/watch?v=dGbDaz_VmYU) and [Robocross-2017](https://youtu.be/AQnd2CRczbQ) competitions and many others.
 
-На базе точно такой же платформы были созданы многие «большие» проекты компании Copter Express, например, дроны для [пиар-акций по автономной доставке пиццы](https://www.youtube.com/watch?v=hmkAoZOtF58) (Самара, Казань); дрон-доставщик кофе в Сколково, мониторинговый дрон с зарядной станцией, дроны-победители на полевых испытаниях «[Робокросс-2016](https://www.youtube.com/watch?v=dGbDaz_VmYU)», «[Робокросс-2017](https://youtu.be/AQnd2CRczbQ)» и многие другие.
+**The main documentation in Russian is available [on our Gitbook](https://clever.copterexpress.com/).**
 
-Для того, чтобы научиться собирать, настраивать, пилотировать и программировать автономный дрон «Клевер», воспользуйтесь этим учебником.
+Use it to learn how to assemble, configure, pilot and program autonomous CLEVER drone.
 
-Основная документация
----------------------
+## Preconfigured RPi 3 image
 
-https://copterexpress.gitbooks.io/clever/content/
+**Preconfigured image for Raspberry Pi 3 with installed and configured software, ready to fly, is available [in the Releases section](https://github.com/CopterExpress/clever/releases).**
 
-**Готовый образ ОС** для RPi 3 с предустановленным и преднастроенным ПО можно скачать [здесь](https://copterexpress.gitbooks.io/clever/content/docs/microsd_images.html).
+[![Build Status](http://builder.coex.space/job/CopterExpress---clever/badge/icon)](http://builder.coex.space/job/CopterExpress---clever/)
 
-[Описание API](https://copterexpress.gitbooks.io/clever/content/docs/simple_offboard.html) для автономных полетов.
+Image includes:
 
-Ручная установка
----------
+* Raspbian Stretch
+* ROS Kinetic
+* Configured networking
+* OpenCV
+* mavros
+* CLEVER software bundle for autonomous drone control
 
-Склонировать репозиторий в папку `/home/pi/catkin_ws/src/clever` (**важно**):
+API description (in Russian) for autonomous flights is available [on GitBook](https://copterexpress.gitbooks.io/clever/simple_offboard.html).
+
+## Manual installation
+
+Install ROS Kinetic according to the [documentation](http://wiki.ros.org/kinetic/Installation).
+
+Clone repo to directory `/home/pi/catkin_ws/src/clever`:
 
 ```bash
 cd ~/catkin_ws/src
-git clone https://github.com/CopterExpress/clever_bundle.git clever
+git clone https://github.com/CopterExpress/clever.git clever
 ```
 
-Пересобрать ROS-пакеты:
+Build ROS packages:
 
 ```bash
 cd ~/catkin_ws
 catkin_make -j1
 ```
 
-Включить сервис roscore (если он не включен):
+Enable systemd service `roscore` (if not enabled):
 
 ```bash
 sudo systemctl enable /home/pi/catkin_ws/src/clever/deploy/roscore.service
 sudo systemctl start roscore
 ```
 
-Включить сервис clever:
+Enable systemd service `clever`:
 
 ```bash
 sudo systemctl enable /home/pi/catkin_ws/src/clever/deploy/clever.service
 sudo systemctl start clever
 ```
 
-Зависимости
------------
+### Dependencies
 
 [ROS Kinetic](http://wiki.ros.org/kinetic).
 
-Необходимые для работы ROS-пакеты:
+Necessary ROS packages:
 
 * `opencv3`
 * `mavros`
@@ -65,8 +72,6 @@ sudo systemctl start clever
 * `cv_camera`
 * `nodelet`
 * `dynamic_reconfigure`
-* `bondcpp`, ветка `master`
+* `bondcpp`, branch `master`
 * `roslint`
 * `rosserial`
-
-TODO: внести в package.xml

SUMMARY.md

@@ -1,44 +0,0 @@
-# Summary
-
-* [Введение](README.md)
-* [Сборка](docs/assemble.md)
-* [Первоначальная настройка](docs/setup.md)
-* [Полетные режимы](docs/modes.md)
-* [Raspberry Pi](docs/raspberry.md)
-* [Образ операционной системы на RPi](docs/microsd_images.md)
-* [Подключение Raspberry Pi к PixHawk](docs/connection.md)
-* [Подключение по Wi-Fi](docs/wifi.md)
-* [Работа с QGroundControl через Wi-Fi](docs/gcs_bridge.md)
-* [SSH-доступ](docs/ssh.md)
-* [Неисправности радиоаппаратуры](docs/radioerrors.md)
-* [Безопасность](docs/safety.md)
-* [Техника безопасности по пайке](docs/tb.md)
-* [Просмотр видеострима с камер](docs/web_video_server.md)
-* [Работа с ROS](docs/ros.md)
-* [MAVROS](docs/mavros.md)
-* [Автономный полет в OFFBOARD](docs/simple_offboard.md)
-* [Навигация по ArUco-маркерам](docs/aruco.md)
-* [Взаимодействие с Arduino](docs/arduino.md)
-* [Системы координат](docs/frames.md)
-* [Работа с камерой \(компьютерное зрение\)](docs/camera.md)
-* [Ориентация камеры](docs/camera_frame.md)
-* [Визуализация с помощью rviz](docs/rviz.md)
-* [Работа с SITL](docs/sitl.md)
-* [Подключение GPS](docs/gps.md)
-* [Использование 3G-модема](docs/3g.md)
-* [Примеры программ](primeri-programm.md)
-* Учебник
-  * [Урок 1](docs/les1.md)
-  * [Урок 2](docs/les2.md)
-  * [Урок 7](docs/les7.md)
-  * [Урок 8](docs/les8.md)
-  * [Урок 9](docs/les9.md)
-  * [Урок 11](docs/les11.md)
-  * [Урок 13](docs/les13.md)
-  * [Урок 15](docs/les15.md)
-  * [Урок 16](docs/les16.md)
-* Другое
-  * [CopterHack-2017](docs/copterhack2017.md)
-  * [Прошивка ESC контроллеров с помощью Arduino](docs/esc_firmware.md)
-* [Полезные ссылки](docs/links.md)
-

apps/ios/.gitignore

@@ -0,0 +1,17 @@
+# Xcode
+.DS_Store
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+!default.xcworkspace
+xcuserdata
+profile
+*.moved-aside
+DerivedData
+Pods/

apps/ios/Podfile

@@ -0,0 +1,13 @@
+project 'cleverrc.xcodeproj/'
+
+# Uncomment the next line to define a global platform for your project
+# platform :ios, '9.0'
+
+target 'cleverrc' do
+  # Comment the next line if you're not using Swift and don't want to use dynamic frameworks
+  use_frameworks!
+
+  # Pods for cleverrc
+  pod 'SwiftSocket', '~> 2.0'
+
+end

apps/ios/Podfile.lock

@@ -0,0 +1,12 @@
+PODS:
+  - SwiftSocket (2.0.2)
+
+DEPENDENCIES:
+  - SwiftSocket (~> 2.0)
+
+SPEC CHECKSUMS:
+  SwiftSocket: 6f4c9c63fbc5c1d61188936bb3c599fd546f40ae
+
+PODFILE CHECKSUM: 2044f57d00f536792fbc38c63ded4fa78dcc135c
+
+COCOAPODS: 1.4.0

apps/ios/README.md

@@ -0,0 +1,10 @@
+iOS-приложение для управления Клевером
+--------------------------------------
+
+Для установки зависимостей необходим [CocoaPods](https://cocoapods.org):
+
+```bash
+pod install
+```
+
+Для разработки и сборки откройте в XCode файл `cleverrc.xcworkspace`.

apps/ios/cleverrc.xcodeproj/project.pbxproj

@@ -0,0 +1,444 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 48;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		7C0AB7AB202A744400BAED27 /* BinUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C0AB7AA202A744400BAED27 /* BinUtils.swift */; };
+		7C51654120139237004D1F4D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C51654020139237004D1F4D /* AppDelegate.swift */; };
+		7C51654320139237004D1F4D /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C51654220139237004D1F4D /* ViewController.swift */; };
+		7C51654620139237004D1F4D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7C51654420139237004D1F4D /* Main.storyboard */; };
+		7C51654820139237004D1F4D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7C51654720139237004D1F4D /* Assets.xcassets */; };
+		7C51654B20139237004D1F4D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7C51654920139237004D1F4D /* LaunchScreen.storyboard */; };
+		7C516553201526BA004D1F4D /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = 7C516552201526BA004D1F4D /* index.html */; };
+		7C51655520153180004D1F4D /* main.js in Resources */ = {isa = PBXBuildFile; fileRef = 7C51655420153180004D1F4D /* main.js */; };
+		7C7DECC2203CBCC4000C1C51 /* roslib.js in Resources */ = {isa = PBXBuildFile; fileRef = 7C45DCE9203A75A2009C73F5 /* roslib.js */; };
+		7CA401E22033CE17009FAA3B /* main.css in Resources */ = {isa = PBXBuildFile; fileRef = 7CA401E12033CE17009FAA3B /* main.css */; };
+		7CA401E42033FA34009FAA3B /* telemetry.js in Resources */ = {isa = PBXBuildFile; fileRef = 7CA401E32033FA34009FAA3B /* telemetry.js */; };
+		7CA401E6203471D9009FAA3B /* clever.svg in Resources */ = {isa = PBXBuildFile; fileRef = 7CA401E5203471D8009FAA3B /* clever.svg */; };
+		C25141CAF1A7125F3CE29DDC /* Pods_cleverrc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C38C04523251039FF13DDCD /* Pods_cleverrc.framework */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		5C38C04523251039FF13DDCD /* Pods_cleverrc.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_cleverrc.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		7C0AB7AA202A744400BAED27 /* BinUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BinUtils.swift; sourceTree = "<group>"; };
+		7C45DCE9203A75A2009C73F5 /* roslib.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = roslib.js; sourceTree = "<group>"; };
+		7C51653D20139237004D1F4D /* cleverrc.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = cleverrc.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		7C51654020139237004D1F4D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		7C51654220139237004D1F4D /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+		7C51654520139237004D1F4D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		7C51654720139237004D1F4D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		7C51654A20139237004D1F4D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		7C51654C20139237004D1F4D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		7C516552201526BA004D1F4D /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = "<group>"; };
+		7C51655420153180004D1F4D /* main.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = main.js; sourceTree = "<group>"; };
+		7CA401E12033CE17009FAA3B /* main.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = main.css; sourceTree = "<group>"; };
+		7CA401E32033FA34009FAA3B /* telemetry.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = telemetry.js; sourceTree = "<group>"; };
+		7CA401E5203471D8009FAA3B /* clever.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = clever.svg; sourceTree = "<group>"; };
+		AAC9195BF3A9BF6942EF4D0B /* Pods-cleverrc.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-cleverrc.release.xcconfig"; path = "Pods/Target Support Files/Pods-cleverrc/Pods-cleverrc.release.xcconfig"; sourceTree = "<group>"; };
+		CB200F4B933204EA97E0E2E4 /* Pods-cleverrc.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-cleverrc.debug.xcconfig"; path = "Pods/Target Support Files/Pods-cleverrc/Pods-cleverrc.debug.xcconfig"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		7C51653A20139237004D1F4D /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C25141CAF1A7125F3CE29DDC /* Pods_cleverrc.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		4FA3968F2242239E15A656D2 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				CB200F4B933204EA97E0E2E4 /* Pods-cleverrc.debug.xcconfig */,
+				AAC9195BF3A9BF6942EF4D0B /* Pods-cleverrc.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
+		66C638F0021EBE07741B26F3 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				5C38C04523251039FF13DDCD /* Pods_cleverrc.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		7C51653420139237004D1F4D = {
+			isa = PBXGroup;
+			children = (
+				66C638F0021EBE07741B26F3 /* Frameworks */,
+				4FA3968F2242239E15A656D2 /* Pods */,
+				7C51653E20139237004D1F4D /* Products */,
+				7C51653F20139237004D1F4D /* cleverrc */,
+			);
+			sourceTree = "<group>";
+		};
+		7C51653E20139237004D1F4D /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				7C51653D20139237004D1F4D /* cleverrc.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		7C51653F20139237004D1F4D /* cleverrc */ = {
+			isa = PBXGroup;
+			children = (
+				7C45DCE9203A75A2009C73F5 /* roslib.js */,
+				7C51654020139237004D1F4D /* AppDelegate.swift */,
+				7C51654720139237004D1F4D /* Assets.xcassets */,
+				7C0AB7AA202A744400BAED27 /* BinUtils.swift */,
+				7C51654C20139237004D1F4D /* Info.plist */,
+				7C51654920139237004D1F4D /* LaunchScreen.storyboard */,
+				7C51654420139237004D1F4D /* Main.storyboard */,
+				7C51654220139237004D1F4D /* ViewController.swift */,
+				7CA401E5203471D8009FAA3B /* clever.svg */,
+				7C516552201526BA004D1F4D /* index.html */,
+				7CA401E12033CE17009FAA3B /* main.css */,
+				7C51655420153180004D1F4D /* main.js */,
+				7CA401E32033FA34009FAA3B /* telemetry.js */,
+			);
+			path = cleverrc;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		7C51653C20139237004D1F4D /* cleverrc */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 7C51654F20139237004D1F4D /* Build configuration list for PBXNativeTarget "cleverrc" */;
+			buildPhases = (
+				9F096121C4A02BCE9D4FD1B9 /* [CP] Check Pods Manifest.lock */,
+				7C51653920139237004D1F4D /* Sources */,
+				7C51653A20139237004D1F4D /* Frameworks */,
+				7C51653B20139237004D1F4D /* Resources */,
+				A37DBBAD5E44E632F8A8A204 /* [CP] Embed Pods Frameworks */,
+				9BAB41D26FC0095C7C86B9DE /* [CP] Copy Pods Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = cleverrc;
+			productName = cleverrc;
+			productReference = 7C51653D20139237004D1F4D /* cleverrc.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		7C51653520139237004D1F4D /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 0920;
+				LastUpgradeCheck = 0930;
+				ORGANIZATIONNAME = "Copter Express";
+				TargetAttributes = {
+					7C51653C20139237004D1F4D = {
+						CreatedOnToolsVersion = 9.2;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 7C51653820139237004D1F4D /* Build configuration list for PBXProject "cleverrc" */;
+			compatibilityVersion = "Xcode 8.0";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 7C51653420139237004D1F4D;
+			productRefGroup = 7C51653E20139237004D1F4D /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				7C51653C20139237004D1F4D /* cleverrc */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		7C51653B20139237004D1F4D /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				7C51654B20139237004D1F4D /* LaunchScreen.storyboard in Resources */,
+				7CA401E6203471D9009FAA3B /* clever.svg in Resources */,
+				7CA401E42033FA34009FAA3B /* telemetry.js in Resources */,
+				7C7DECC2203CBCC4000C1C51 /* roslib.js in Resources */,
+				7C516553201526BA004D1F4D /* index.html in Resources */,
+				7C51654820139237004D1F4D /* Assets.xcassets in Resources */,
+				7CA401E22033CE17009FAA3B /* main.css in Resources */,
+				7C51654620139237004D1F4D /* Main.storyboard in Resources */,
+				7C51655520153180004D1F4D /* main.js in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		9BAB41D26FC0095C7C86B9DE /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-cleverrc/Pods-cleverrc-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		9F096121C4A02BCE9D4FD1B9 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-cleverrc-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		A37DBBAD5E44E632F8A8A204 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-cleverrc/Pods-cleverrc-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/SwiftSocket/SwiftSocket.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftSocket.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-cleverrc/Pods-cleverrc-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		7C51653920139237004D1F4D /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				7C51654320139237004D1F4D /* ViewController.swift in Sources */,
+				7C51654120139237004D1F4D /* AppDelegate.swift in Sources */,
+				7C0AB7AB202A744400BAED27 /* BinUtils.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		7C51654420139237004D1F4D /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				7C51654520139237004D1F4D /* Base */,
+			);
+			name = Main.storyboard;
+			path = .;
+			sourceTree = "<group>";
+		};
+		7C51654920139237004D1F4D /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				7C51654A20139237004D1F4D /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			path = .;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		7C51654D20139237004D1F4D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		7C51654E20139237004D1F4D /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		7C51655020139237004D1F4D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = CB200F4B933204EA97E0E2E4 /* Pods-cleverrc.debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = M8TDN3PAH2;
+				INFOPLIST_FILE = cleverrc/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = coex.cleverrc;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		7C51655120139237004D1F4D /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = AAC9195BF3A9BF6942EF4D0B /* Pods-cleverrc.release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = M8TDN3PAH2;
+				INFOPLIST_FILE = cleverrc/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = coex.cleverrc;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		7C51653820139237004D1F4D /* Build configuration list for PBXProject "cleverrc" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				7C51654D20139237004D1F4D /* Debug */,
+				7C51654E20139237004D1F4D /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		7C51654F20139237004D1F4D /* Build configuration list for PBXNativeTarget "cleverrc" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				7C51655020139237004D1F4D /* Debug */,
+				7C51655120139237004D1F4D /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 7C51653520139237004D1F4D /* Project object */;
+}

apps/ios/cleverrc.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:cleverrc.xcodeproj">
+   </FileRef>
+</Workspace>

apps/ios/cleverrc.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:cleverrc.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>

apps/ios/cleverrc.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

apps/ios/cleverrc/AppDelegate.swift

@@ -0,0 +1,46 @@
+//
+//  AppDelegate.swift
+//  cleverrc
+//
+//  Created by Oleg Kalachev on 20.01.2018.
+//  Copyright © 2018 Copter Express. All rights reserved.
+//
+
+import UIKit
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate {
+
+    var window: UIWindow?
+
+
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+        // Override point for customization after application launch.
+        return true
+    }
+
+    func applicationWillResignActive(_ application: UIApplication) {
+        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+        // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+    }
+
+    func applicationDidEnterBackground(_ application: UIApplication) {
+        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+    }
+
+    func applicationWillEnterForeground(_ application: UIApplication) {
+        // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
+    }
+
+    func applicationDidBecomeActive(_ application: UIApplication) {
+        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    }
+
+    func applicationWillTerminate(_ application: UIApplication) {
+        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+    }
+
+
+}
+

apps/ios/cleverrc/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,178 @@
+{
+  "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-40x40@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-60x60@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-60x60@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@2x-1.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-29x29@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-29x29@2x-1.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-40x40@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-40x40@2x-1.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-76x76@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-76x76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "ItunesArtwork@2x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "24x24",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "notificationCenter",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "27.5x27.5",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "notificationCenter",
+      "subtype" : "42mm"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "watch",
+      "role" : "companionSettings",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "watch",
+      "role" : "companionSettings",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "appLauncher",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "44x44",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "longLook",
+      "subtype" : "42mm"
+    },
+    {
+      "size" : "86x86",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "98x98",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "42mm"
+    },
+    {
+      "idiom" : "watch-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "pre-rendered" : true
+  }
+}

apps/ios/cleverrc/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

apps/ios/cleverrc/Base.lproj/LaunchScreen.storyboard

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" red="0.10586584359407425" green="0.10589186102151871" blue="0.10586420446634293" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+</document>

apps/ios/cleverrc/Base.lproj/Main.storyboard

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina4_7" orientation="landscape">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="tne-QT-ifu">
+            <objects>
+                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="cleverrc" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                        <rect key="frame" x="0.0" y="0.0" width="667" height="375"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <wkWebView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dtJ-LN-BYT">
+                                <rect key="frame" x="0.0" y="0.0" width="667" height="375"/>
+                                <color key="backgroundColor" red="0.12939286231994629" green="0.12942266464233398" blue="0.12939092516899109" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <wkWebViewConfiguration key="configuration">
+                                    <audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/>
+                                    <wkPreferences key="preferences"/>
+                                </wkWebViewConfiguration>
+                            </wkWebView>
+                        </subviews>
+                        <color key="backgroundColor" red="0.1097869947552681" green="0.10981365293264389" blue="0.10978532582521439" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="dtJ-LN-BYT" firstAttribute="height" secondItem="8bC-Xf-vdC" secondAttribute="height" id="KRn-ag-67x"/>
+                            <constraint firstItem="dtJ-LN-BYT" firstAttribute="width" secondItem="8bC-Xf-vdC" secondAttribute="width" id="qOr-gg-e4M"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                    </view>
+                    <connections>
+                        <outlet property="webView" destination="dtJ-LN-BYT" id="bQ3-jy-o6E"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="138.0809595202399" y="124"/>
+        </scene>
+    </scenes>
+</document>

apps/ios/cleverrc/BinUtils.swift

@@ -0,0 +1,453 @@
+//
+//  BinUtils.swift
+//  BinUtils
+//
+//  Created by Nicolas Seriot on 12/03/16.
+//  Copyright © 2016 Nicolas Seriot. All rights reserved.
+//
+
+import Foundation
+import CoreFoundation
+
+// MARK: protocol UnpackedType
+
+public protocol Unpackable {}
+
+extension NSString: Unpackable {}
+extension Bool: Unpackable {}
+extension Int: Unpackable {}
+extension Double: Unpackable {}
+
+// MARK: protocol DataConvertible
+
+protocol DataConvertible {}
+
+extension DataConvertible {
+    
+    init?(data: Data) {
+        guard data.count == MemoryLayout<Self>.size else { return nil }
+        self = data.withUnsafeBytes { $0.pointee }
+    }
+
+    init?(bytes: [UInt8]) {
+        let data = Data(bytes:bytes)
+        self.init(data:data)
+    }
+    
+    var data: Data {
+        var value = self
+        return Data(buffer: UnsafeBufferPointer(start: &value, count: 1))
+    }
+}
+
+extension Bool : DataConvertible { }
+
+extension Int8 : DataConvertible { }
+extension Int16 : DataConvertible { }
+extension Int32 : DataConvertible { }
+extension Int64 : DataConvertible { }
+
+extension UInt8 : DataConvertible { }
+extension UInt16 : DataConvertible { }
+extension UInt32 : DataConvertible { }
+extension UInt64 : DataConvertible { }
+
+extension Float32 : DataConvertible { }
+extension Float64 : DataConvertible { }
+
+// MARK: String extension
+
+extension String {
+    subscript (from:Int, to:Int) -> String {
+        return NSString(string: self).substring(with: NSMakeRange(from, to-from))
+    }
+}
+
+// MARK: Data extension
+
+extension Data {
+    var bytes : [UInt8] {
+        return self.withUnsafeBytes {
+            [UInt8](UnsafeBufferPointer(start: $0, count: self.count))
+        }
+    }
+}
+
+// MARK: functions
+
+public func hexlify(_ data:Data) -> String {
+    
+    // similar to hexlify() in Python's binascii module
+    // https://docs.python.org/2/library/binascii.html
+    
+    var s = String()
+    var byte: UInt8 = 0
+    
+    for i in 0 ..< data.count {
+        NSData(data: data).getBytes(&byte, range: NSMakeRange(i, 1))
+        s = s.appendingFormat("%02x", byte)
+    }
+    
+    return s as String
+}
+
+public func unhexlify(_ string:String) -> Data? {
+    
+    // similar to unhexlify() in Python's binascii module
+    // https://docs.python.org/2/library/binascii.html
+    
+    let s = string.uppercased().replacingOccurrences(of: " ", with: "")
+    
+    let nonHexCharacterSet = CharacterSet(charactersIn: "0123456789ABCDEF").inverted
+    if let range = s.rangeOfCharacter(from: nonHexCharacterSet) {
+        print("-- found non hex character at range \(range)")
+        return nil
+    }
+    
+    var data = Data(capacity: s.count / 2)
+    
+    for i in stride(from: 0, to:s.count, by:2) {
+        let byteString = s[i, i+2]
+        let byte = UInt8(byteString.withCString { strtoul($0, nil, 16) })
+        data.append([byte] as [UInt8], count: 1)
+    }
+    
+    return data
+}
+
+func readIntegerType<T:DataConvertible>(_ type:T.Type, bytes:[UInt8], loc:inout Int) -> T {
+    let size = MemoryLayout<T>.size
+    let sub = Array(bytes[loc..<(loc+size)])
+    loc += size
+    return T(bytes: sub)!
+}
+
+func readFloatingPointType<T:DataConvertible>(_ type:T.Type, bytes:[UInt8], loc:inout Int, isBigEndian:Bool) -> T {
+    let size = MemoryLayout<T>.size
+    let sub = Array(bytes[loc..<(loc+size)])
+    loc += size
+    let sub_ = isBigEndian ? sub.reversed() : sub
+    return T(bytes: sub_)!
+}
+
+func isBigEndianFromMandatoryByteOrderFirstCharacter(_ format:String) -> Bool {
+    
+    guard let firstChar = format.first else { assertionFailure("empty format"); return false }
+    
+    let s = NSString(string: String(firstChar))
+    let c = s.substring(to: 1)
+    
+    if c == "@" { assertionFailure("native size and alignment is unsupported") }
+    
+    if c == "=" || c == "<" { return false }
+    if c == ">" || c == "!" { return true }
+    
+    assertionFailure("format '\(format)' first character must be among '=<>!'")
+    
+    return false
+}
+
+// akin to struct.calcsize(fmt)
+func numberOfBytesInFormat(_ format:String) -> Int {
+    
+    var numberOfBytes = 0
+    
+    var n = 0 // repeat counter
+    
+    var mutableFormat = format
+    
+    while !mutableFormat.isEmpty {
+        
+        let c = mutableFormat.remove(at: mutableFormat.startIndex)
+        
+        if let i = Int(String(c)) , 0...9 ~= i {
+            if n > 0 { n *= 10 }
+            n += i
+            continue
+        }
+        
+        if c == "s" {
+            numberOfBytes += max(n,1)
+            n = 0
+            continue
+        }
+        
+        for _ in 0..<max(n,1) {
+            
+            switch(c) {
+                
+            case "@", "<", "=", ">", "!", " ":
+                ()
+            case "c", "b", "B", "x", "?":
+                numberOfBytes += 1
+            case "h", "H":
+                numberOfBytes += 2
+            case "i", "l", "I", "L", "f":
+                numberOfBytes += 4
+            case "q", "Q", "d":
+                numberOfBytes += 8
+            case "P":
+                numberOfBytes += MemoryLayout<Int>.size
+            default:
+                assertionFailure("-- unsupported format \(c)")
+            }
+        }
+        
+        n = 0
+    }
+    
+    return numberOfBytes
+}
+
+func formatDoesMatchDataLength(_ format:String, data:Data) -> Bool {
+    let sizeAccordingToFormat = numberOfBytesInFormat(format)
+    let dataLength = data.count
+    if sizeAccordingToFormat != dataLength {
+        print("format \"\(format)\" expects \(sizeAccordingToFormat) bytes but data is \(dataLength) bytes")
+        return false
+    }
+    
+    return true
+}
+
+/*
+ pack() and unpack() should behave as Python's struct module https://docs.python.org/2/library/struct.html BUT:
+ - native size and alignment '@' is not supported
+ - as a consequence, the byte order specifier character is mandatory and must be among "=<>!"
+ - native byte order '=' assumes a little-endian system (eg. Intel x86)
+ - Pascal strings 'p' and native pointers 'P' are not supported
+ */
+
+public enum BinUtilsError: Error {
+    case formatDoesMatchDataLength(format:String, dataSize:Int)
+    case unsupportedFormat(character:Character)
+}
+
+public func pack(_ format:String, _ objects:[Any], _ stringEncoding:String.Encoding=String.Encoding.windowsCP1252) -> Data {
+    
+    var objectsQueue = objects
+    
+    var mutableFormat = format
+    
+    var mutableData = Data()
+    
+    var isBigEndian = false
+    
+    let firstCharacter = mutableFormat.remove(at: mutableFormat.startIndex)
+    
+    switch(firstCharacter) {
+    case "<", "=":
+        isBigEndian = false
+    case ">", "!":
+        isBigEndian = true
+    case "@":
+        assertionFailure("native size and alignment '@' is unsupported'")
+    default:
+        assertionFailure("unsupported format chacracter'")
+    }
+    
+    var n = 0 // repeat counter
+    
+    while !mutableFormat.isEmpty {
+        
+        let c = mutableFormat.remove(at: mutableFormat.startIndex)
+        
+        if let i = Int(String(c)) , 0...9 ~= i {
+            if n > 0 { n *= 10 }
+            n += i
+            continue
+        }
+        
+        var o : Any = 0
+        
+        if c == "s" {
+            o = objectsQueue.remove(at: 0)
+            
+            guard let stringData = (o as! String).data(using: .utf8) else { assertionFailure(); return Data() }
+            var bytes = stringData.bytes
+            
+            let expectedSize = max(1, n)
+            
+            // pad ...
+            while bytes.count < expectedSize { bytes.append(0x00) }
+            
+            // ... or trunk
+            if bytes.count > expectedSize { bytes = Array(bytes[0..<expectedSize]) }
+            
+            assert(bytes.count == expectedSize)
+            
+            if isBigEndian { bytes = bytes.reversed() }
+            
+            mutableData.append(bytes, count: bytes.count)
+            
+            n = 0
+            continue
+        }
+        
+        for _ in 0..<max(n,1) {
+            
+            var bytes : [UInt8] = []
+            
+            if c != "x" {
+                o = objectsQueue.removeFirst()
+            }
+            
+            switch(c) {
+            case "?":
+                bytes = (o as! Bool) ? [0x01] : [0x00]
+            case "c":
+                let charAsString = (o as! NSString).substring(to: 1)
+                guard let data = charAsString.data(using: stringEncoding) else {
+                    assertionFailure("cannot decode character \(charAsString) using encoding \(stringEncoding)")
+                    return Data()
+                }
+                bytes = data.bytes
+            case "b":
+                bytes = Int8(truncatingIfNeeded:o as! Int).data.bytes
+            case "h":
+                bytes = Int16(truncatingIfNeeded:o as! Int).data.bytes
+            case "i", "l":
+                bytes = Int32(truncatingIfNeeded:o as! Int).data.bytes
+            case "q", "Q":
+                bytes = Int64(o as! Int).data.bytes
+            case "B":
+                bytes = UInt8(truncatingIfNeeded:o as! Int).data.bytes
+            case "H":
+                bytes = UInt16(truncatingIfNeeded:o as! Int).data.bytes
+            case "I", "L":
+                bytes = UInt32(truncatingIfNeeded:o as! Int).data.bytes
+            case "f":
+                bytes = Float32(o as! Double).data.bytes
+            case "d":
+                bytes = Float64(o as! Double).data.bytes
+            case "x":
+                bytes = [0x00]
+            default:
+                assertionFailure("Unsupported packing format: \(c)")
+            }
+            
+            if isBigEndian { bytes = bytes.reversed() }
+            let data = Data(bytes)
+            mutableData.append(data)
+        }
+        
+        n = 0
+    }
+    
+    return mutableData
+}
+
+public func unpack(_ format:String, _ data:Data, _ stringEncoding:String.Encoding=String.Encoding.windowsCP1252) throws -> [Unpackable] {
+    
+    assert(CFByteOrderGetCurrent() == 1 /* CFByteOrderLittleEndian */, "\(#file) assumes little endian, but host is big endian")
+    
+    let isBigEndian = isBigEndianFromMandatoryByteOrderFirstCharacter(format)
+    
+    if formatDoesMatchDataLength(format, data: data) == false {
+        throw BinUtilsError.formatDoesMatchDataLength(format:format, dataSize:data.count)
+    }
+    
+    var a : [Unpackable] = []
+    
+    var loc = 0
+    
+    let bytes = data.bytes
+    
+    var n = 0 // repeat counter
+    
+    var mutableFormat = format
+    
+    mutableFormat.remove(at: mutableFormat.startIndex) // consume byte-order specifier
+    
+    while !mutableFormat.isEmpty {
+        
+        let c = mutableFormat.remove(at: mutableFormat.startIndex)
+        
+        if let i = Int(String(c)) , 0...9 ~= i {
+            if n > 0 { n *= 10 }
+            n += i
+            continue
+        }
+        
+        if c == "s" {
+            let length = max(n,1)
+            let sub = Array(bytes[loc..<loc+length])
+            
+            guard let s = NSString(bytes: sub, length: length, encoding: stringEncoding.rawValue) else {
+                assertionFailure("-- not a string: \(sub)")
+                return []
+            }
+            
+            a.append(s)
+            
+            loc += length
+            
+            n = 0
+            
+            continue
+        }
+        
+        for _ in 0..<max(n,1) {
+            
+            var o : Unpackable?
+            
+            switch(c) {
+                
+            case "c":
+                let optionalString = NSString(bytes: [bytes[loc]], length: 1, encoding: String.Encoding.utf8.rawValue)
+                loc += 1
+                guard let s = optionalString else { assertionFailure(); return [] }
+                o = s
+            case "b":
+                let r = readIntegerType(Int8.self, bytes:bytes, loc:&loc)
+                o = Int(r)
+            case "B":
+                let r = readIntegerType(UInt8.self, bytes:bytes, loc:&loc)
+                o = Int(r)
+            case "?":
+                let r = readIntegerType(Bool.self, bytes:bytes, loc:&loc)
+                o = r ? true : false
+            case "h":
+                let r = readIntegerType(Int16.self, bytes:bytes, loc:&loc)
+                o = Int(isBigEndian ? Int16(bigEndian: r) : r)
+            case "H":
+                let r = readIntegerType(UInt16.self, bytes:bytes, loc:&loc)
+                o = Int(isBigEndian ? UInt16(bigEndian: r) : r)
+            case "i":
+                fallthrough
+            case "l":
+                let r = readIntegerType(Int32.self, bytes:bytes, loc:&loc)
+                o = Int(isBigEndian ? Int32(bigEndian: r) : r)
+            case "I":
+                fallthrough
+            case "L":
+                let r = readIntegerType(UInt32.self, bytes:bytes, loc:&loc)
+                o = Int(isBigEndian ? UInt32(bigEndian: r) : r)
+            case "q":
+                let r = readIntegerType(Int64.self, bytes:bytes, loc:&loc)
+                o = Int(isBigEndian ? Int64(bigEndian: r) : r)
+            case "Q":
+                let r = readIntegerType(UInt64.self, bytes:bytes, loc:&loc)
+                o = Int(isBigEndian ? UInt64(bigEndian: r) : r)
+            case "f":
+                let r = readFloatingPointType(Float32.self, bytes:bytes, loc:&loc, isBigEndian:isBigEndian)
+                o = Double(r)
+            case "d":
+                let r = readFloatingPointType(Float64.self, bytes:bytes, loc:&loc, isBigEndian:isBigEndian)
+                o = Double(r)
+            case "x":
+                loc += 1
+            case " ":
+                ()
+            default:
+                throw BinUtilsError.unsupportedFormat(character:c)
+            }
+            
+            if let o = o { a.append(o) }
+        }
+        
+        n = 0
+    }
+    
+    return a
+}

apps/ios/cleverrc/Info.plist

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>CLEVER RC</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.1</string>
+	<key>CFBundleVersion</key>
+	<string>6</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>

apps/ios/cleverrc/README.md

@@ -0,0 +1,10 @@
+iOS-приложение для управления Клевером
+--------------------------------------
+
+Для установки зависимостей необходим [CocoaPods](https://cocoapods.org):
+
+```bash
+pod install
+```
+
+Для разработки и сборки откройте в XCode файл `cleverrc.xcworkspace`.

apps/ios/cleverrc/ViewController.swift

@@ -0,0 +1,85 @@
+//
+//  ViewController.swift
+//  cleverrc
+//
+//  Created by Oleg Kalachev on 20.01.2018.
+//  Copyright © 2018 Copter Express. All rights reserved.
+//
+
+import UIKit
+import WebKit
+import SwiftSocket
+import AudioToolbox.AudioServices
+
+class ViewController: UIViewController, WKScriptMessageHandler {
+    @IBOutlet weak var webView: WKWebView!
+    let impactGenerator = UIImpactFeedbackGenerator(style: .medium)
+    let notificationGenerator = UINotificationFeedbackGenerator()
+    let udpSocket = UDPClient(address: "255.255.255.255", port: 35602)
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Don't lock screen
+        UIApplication.shared.isIdleTimerDisabled = true
+
+        // Setup webview event handlers
+        webView.scrollView.bounces = false;
+        webView.configuration.userContentController.add(self, name: "control")
+        webView.configuration.userContentController.add(self, name: "controlStart")
+        webView.configuration.userContentController.add(self, name: "lowBattery")
+        webView.configuration.userContentController.add(self, name: "notification")
+
+        // Load the main page
+        let url = Bundle.main.url(forResource: "index", withExtension: "html")
+        let requestObj = URLRequest(url: url!)
+        webView.load(requestObj)
+
+        // Setup UDP broadcasting
+        udpSocket.enableBroadcast()
+
+        // Set UDP broadcasting interface
+        var wifiInterface = if_nametoindex("en0");
+        setsockopt(udpSocket.fd!, IPPROTO_IP, IP_BOUND_IF, &wifiInterface, socklen_t(MemoryLayout<UInt32>.size));
+    }
+
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+
+    func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
+        if (message.name == "control") {
+            // Send UDP control message
+            let m = message.body as! NSDictionary;
+            let d = pack("<hhhh", [m["x"]!, m["y"]!, m["z"]!, m["r"]!])
+            _ = udpSocket.send(data: d)
+        } else if (message.name == "lowBattery") {
+            // Got low battery notification
+            print("Low battery notification")
+            tapticNotify()
+        } else if (message.name == "notification") {
+            // Got notification message
+            print(message)
+            tapticNotify()
+        }
+    }
+
+    func tapticNotify() {
+        if let feedbackSupportLevel = UIDevice.current.value(forKey: "_feedbackSupportLevel") as? Int {
+            switch feedbackSupportLevel {
+            case 2:
+                // 2nd Generation Taptic Engine w/ Haptic Feedback (iPhone 7/7+)
+                notificationGenerator.notificationOccurred(.warning)
+            case 1:
+                // 1st Generation Taptic Engine (iPhone 6S/6S+)
+                let peek = SystemSoundID(1519)
+                AudioServicesPlaySystemSound(peek)
+            case 0:
+                // No Taptic Engine
+                break
+            default: break
+            }
+        }
+    }
+}

apps/ios/cleverrc/clever.svg

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   viewBox="0 0 69.988266 69.987198"
+   height="69.987198"
+   width="69.988266"
+   xml:space="preserve"
+   id="svg2"
+   version="1.1"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6"><clipPath
+       id="clipPath18"
+       clipPathUnits="userSpaceOnUse"><path
+         id="path16"
+         d="M 0,52.49 H 52.491 V 0 H 0 Z" /></clipPath></defs><g
+     transform="matrix(1.3333333,0,0,-1.3333333,0,69.9872)"
+     id="g10"><g
+       id="g12"><g
+         clip-path="url(#clipPath18)"
+         id="g14"><g
+           transform="translate(35.6531,35.3361)"
+           id="g20"><path
+             id="path22"
+             style="fill:white;fill-opacity:0.5;fill-rule:nonzero;stroke:none"
+             d="M 0,0 C 0.279,0.322 0.5,0.686 0.657,1.081 0.827,1.513 0.914,1.968 0.917,2.434 0.92,2.924 0.829,3.403 0.647,3.857 0.458,4.329 0.165,4.77 -0.2,5.13 -0.587,5.512 -1.061,5.812 -1.571,5.995 -2.138,6.198 -2.756,6.262 -3.358,6.18 -3.821,6.115 -4.263,5.967 -4.671,5.739 -4.886,5.618 -5.094,5.472 -5.291,5.305 L -5.467,5.151 C -5.527,5.099 -5.587,5.049 -5.649,5.003 -5.775,4.909 -5.906,4.827 -6.04,4.759 -6.173,4.691 -6.314,4.633 -6.458,4.586 -6.575,4.549 -6.696,4.519 -6.819,4.496 -6.917,4.478 -7.017,4.465 -7.115,4.457 c -0.623,-0.052 -1.281,0.082 -1.9,0.385 -0.224,0.111 -0.439,0.241 -0.64,0.387 -0.042,0.03 -0.084,0.063 -0.127,0.095 -0.039,0.031 -0.069,0.054 -0.102,0.09 -0.023,0.025 -0.043,0.05 -0.061,0.077 -0.056,0.082 -0.093,0.176 -0.107,0.271 -0.004,0.022 -0.005,0.044 -0.006,0.066 l -0.002,6.486 c -0.534,0.589 -1.115,1.136 -1.728,1.626 -0.913,0.73 -1.913,1.352 -2.971,1.845 -0.867,0.405 -1.779,0.725 -2.711,0.952 -0.851,0.208 -1.731,0.34 -2.617,0.391 -0.912,0.053 -1.834,0.023 -2.741,-0.092 -0.741,-0.094 -1.479,-0.246 -2.194,-0.453 -1.274,-0.365 -2.494,-0.905 -3.628,-1.604 -0.824,-0.507 -1.603,-1.101 -2.316,-1.764 -0.687,-0.64 -1.317,-1.35 -1.871,-2.109 -0.505,-0.692 -0.951,-1.432 -1.327,-2.2 -0.375,-0.764 -0.684,-1.566 -0.919,-2.383 -0.201,-0.7 -0.351,-1.423 -0.446,-2.147 -0.12,-0.919 -0.153,-1.858 -0.099,-2.79 0.05,-0.838 0.171,-1.673 0.359,-2.482 0.201,-0.856 0.481,-1.7 0.833,-2.507 0.546,-1.253 1.265,-2.423 2.136,-3.479 0.317,-0.384 0.654,-0.753 1.002,-1.098 0.158,-0.157 0.32,-0.31 0.485,-0.459 h 6.121 c 0.051,0.08 0.099,0.161 0.143,0.245 0.037,0.071 0.072,0.144 0.104,0.218 0.026,0.062 0.05,0.128 0.073,0.193 0.132,0.394 0.159,0.784 0.077,1.127 -0.013,0.052 -0.028,0.105 -0.046,0.157 -0.024,0.068 -0.053,0.136 -0.087,0.201 -0.048,0.09 -0.105,0.174 -0.169,0.249 -0.035,0.041 -0.07,0.079 -0.107,0.116 l -0.024,0.026 c -0.025,0.029 -0.046,0.053 -0.066,0.079 -0.014,0.02 -0.02,0.029 -0.027,0.038 l -0.079,0.096 c -0.109,0.134 -0.212,0.277 -0.304,0.42 -0.207,0.318 -0.378,0.659 -0.506,1.013 -0.118,0.32 -0.202,0.651 -0.252,0.985 -0.085,0.571 -0.073,1.146 0.035,1.71 0.098,0.509 0.273,0.999 0.521,1.454 0.258,0.475 0.588,0.903 0.98,1.272 0.419,0.394 0.895,0.711 1.415,0.942 0.557,0.249 1.15,0.393 1.762,0.428 0.659,0.035 1.298,-0.05 1.914,-0.258 0.653,-0.221 1.268,-0.585 1.78,-1.05 0.541,-0.492 0.977,-1.106 1.261,-1.776 0.151,-0.357 0.26,-0.729 0.324,-1.106 0.072,-0.415 0.092,-0.843 0.058,-1.272 -0.031,-0.388 -0.108,-0.773 -0.227,-1.144 -0.11,-0.341 -0.257,-0.673 -0.441,-0.988 -0.103,-0.177 -0.216,-0.347 -0.335,-0.503 -0.037,-0.051 -0.077,-0.1 -0.117,-0.151 l -0.033,-0.04 -0.005,0.002 -0.049,-0.07 c -0.022,-0.028 -0.043,-0.054 -0.066,-0.08 l -0.076,-0.08 c -0.028,-0.03 -0.055,-0.062 -0.081,-0.094 -0.05,-0.063 -0.095,-0.131 -0.134,-0.202 -0.035,-0.064 -0.066,-0.131 -0.09,-0.199 -0.019,-0.053 -0.035,-0.105 -0.049,-0.158 -0.085,-0.34 -0.062,-0.729 0.066,-1.123 0.021,-0.066 0.045,-0.13 0.071,-0.193 0.03,-0.073 0.063,-0.145 0.1,-0.215 0.045,-0.088 0.096,-0.176 0.156,-0.269 h 7.162 l 0.002,7.527 c 10e-4,0.022 0.002,0.043 0.006,0.065 0.008,0.061 0.027,0.124 0.057,0.187 0.03,0.06 0.067,0.114 0.111,0.161 0.034,0.037 0.065,0.062 0.102,0.09 l 0.062,0.048 c 0.087,0.065 0.173,0.126 0.262,0.183 0.487,0.316 1.027,0.526 1.563,0.608 0.154,0.024 0.312,0.037 0.482,0.04 0.037,0.001 0.076,0 0.113,-0.001 0.062,-0.002 0.124,-0.005 0.186,-0.01 0.123,-0.011 0.247,-0.029 0.367,-0.053 0.338,-0.071 0.654,-0.2 0.939,-0.383 0.11,-0.07 0.214,-0.149 0.31,-0.231 0.031,-0.026 0.061,-0.053 0.09,-0.081 l 0.029,-0.028 -0.07,-0.106 c 0.003,-0.003 0.007,-0.007 0.01,-0.01 l 0.071,0.101 0.215,-0.169 c 0.13,-0.101 0.243,-0.179 0.358,-0.25 0.24,-0.146 0.497,-0.266 0.763,-0.355 0.656,-0.219 1.363,-0.253 2.04,-0.097 0.374,0.086 0.731,0.229 1.059,0.424 C -0.581,-0.571 -0.268,-0.309 0,0" /></g><g
+           transform="translate(41.5882,22.8337)"
+           id="g24"><path
+             id="path26"
+             style="fill:white;fill-opacity:0.5;fill-rule:nonzero;stroke:none"
+             d="M 0,0 V 0 L 0.053,0.044 0.013,0.018 Z" /></g><g
+           transform="translate(28.5515,3.2736)"
+           id="g28"><path
+             id="path30"
+             style="fill:white;fill-opacity:0.5;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0.934,-0.757 1.959,-1.398 3.045,-1.906 0.84,-0.39 1.72,-0.702 2.615,-0.927 0.883,-0.222 1.796,-0.362 2.714,-0.416 0.944,-0.054 1.897,-0.019 2.832,0.106 0.707,0.094 1.414,0.242 2.102,0.439 1.276,0.368 2.496,0.908 3.628,1.605 0.798,0.492 1.556,1.065 2.251,1.704 0.724,0.666 1.384,1.408 1.962,2.205 0.468,0.646 0.886,1.334 1.242,2.044 0.409,0.815 0.742,1.672 0.99,2.547 0.179,0.628 0.316,1.274 0.409,1.921 0.14,0.979 0.182,1.98 0.123,2.973 -0.048,0.819 -0.165,1.638 -0.348,2.433 -0.2,0.872 -0.484,1.732 -0.843,2.556 -0.538,1.234 -1.247,2.392 -2.106,3.442 -0.313,0.381 -0.648,0.752 -0.998,1.1 l -0.52,0.493 H 12.982 L 12.831,22.068 C 12.797,22.003 12.763,21.931 12.732,21.857 12.705,21.794 12.681,21.73 12.659,21.665 12.527,21.268 12.5,20.878 12.582,20.536 c 0.012,-0.053 0.027,-0.105 0.045,-0.156 0.024,-0.069 0.054,-0.137 0.088,-0.202 0.046,-0.086 0.103,-0.171 0.169,-0.251 0.027,-0.032 0.056,-0.062 0.086,-0.093 l 0.045,-0.048 c 0.023,-0.025 0.044,-0.051 0.065,-0.078 l -0.046,-0.082 0.061,0.057 0.003,-0.002 0.022,-0.028 -10e-4,-10e-4 0.01,-0.015 0.004,0.003 0.05,-0.062 c 0.171,-0.212 0.322,-0.433 0.451,-0.659 0.275,-0.478 0.469,-0.996 0.575,-1.538 0.141,-0.718 0.124,-1.472 -0.05,-2.181 -0.152,-0.623 -0.431,-1.228 -0.807,-1.751 -0.303,-0.42 -0.667,-0.79 -1.082,-1.1 C 11.868,12.048 11.425,11.81 10.954,11.64 10.456,11.461 9.935,11.362 9.406,11.345 8.955,11.331 8.505,11.376 8.07,11.48 c -0.494,0.118 -0.965,0.308 -1.399,0.565 -0.509,0.301 -0.958,0.685 -1.333,1.14 -0.393,0.477 -0.692,1.014 -0.89,1.596 -0.218,0.645 -0.305,1.348 -0.25,2.031 0.029,0.355 0.095,0.704 0.194,1.037 0.114,0.383 0.273,0.751 0.474,1.095 0.095,0.164 0.207,0.334 0.334,0.503 0.038,0.051 0.078,0.102 0.118,0.151 L 5.45,19.56 v 0 l -0.101,0.074 0.055,0.073 c 0.023,0.028 0.045,0.054 0.066,0.078 l 0.076,0.08 c 0.03,0.031 0.057,0.062 0.082,0.095 0.05,0.063 0.095,0.131 0.135,0.203 0.034,0.063 0.065,0.13 0.09,0.199 0.019,0.052 0.034,0.103 0.047,0.156 0.086,0.341 0.063,0.73 -0.065,1.124 -0.021,0.065 -0.044,0.129 -0.071,0.193 -0.033,0.082 -0.071,0.162 -0.113,0.24 -0.044,0.084 -0.092,0.165 -0.143,0.244 h -7.162 l -0.002,-7.532 c -0.001,-0.02 -0.003,-0.041 -0.006,-0.06 -0.015,-0.099 -0.052,-0.192 -0.107,-0.272 -0.018,-0.027 -0.039,-0.052 -0.061,-0.076 -0.035,-0.037 -0.064,-0.061 -0.102,-0.09 -0.02,-0.016 -0.042,-0.033 -0.065,-0.05 -0.122,-0.091 -0.254,-0.181 -0.393,-0.264 -0.619,-0.37 -1.29,-0.565 -1.942,-0.565 -0.093,-0.003 -0.179,0.003 -0.268,0.011 -0.11,0.01 -0.221,0.025 -0.33,0.046 -0.36,0.071 -0.709,0.213 -1.008,0.411 -0.109,0.072 -0.213,0.152 -0.309,0.237 -0.029,0.026 -0.058,0.052 -0.085,0.079 h -0.026 l -0.022,0.042 -0.036,0.027 c -0.035,0.03 -0.061,0.051 -0.087,0.072 l -0.073,0.059 c -0.212,0.162 -0.427,0.296 -0.648,0.404 -0.416,0.204 -0.861,0.328 -1.324,0.367 -0.345,0.028 -0.695,0.012 -1.037,-0.053 -0.259,-0.05 -0.511,-0.126 -0.75,-0.228 -0.498,-0.211 -0.954,-0.534 -1.32,-0.936 -0.345,-0.381 -0.614,-0.838 -0.779,-1.322 -0.154,-0.455 -0.218,-0.933 -0.191,-1.421 0.026,-0.462 0.136,-0.909 0.326,-1.327 0.175,-0.386 0.412,-0.738 0.706,-1.047 0.283,-0.296 0.609,-0.543 0.97,-0.734 0.319,-0.168 0.661,-0.289 1.015,-0.36 0.449,-0.089 0.906,-0.095 1.357,-0.021 0.246,0.041 0.49,0.108 0.725,0.198 0.254,0.098 0.499,0.225 0.727,0.377 0.113,0.075 0.229,0.161 0.343,0.257 l 0.068,0.054 0.016,0.046 0.041,0.002 c 0.012,0.013 0.02,0.02 0.029,0.028 l 0.055,0.052 c 0.051,0.043 0.1,0.084 0.151,0.124 0.104,0.08 0.212,0.151 0.322,0.213 0.28,0.159 0.589,0.268 0.917,0.324 0.152,0.026 0.31,0.04 0.48,0.043 h 0.109 C -4.1,9.429 -3.938,9.414 -3.782,9.389 -3.261,9.303 -2.734,9.095 -2.256,8.787 -2.167,8.73 -2.08,8.668 -1.996,8.604 l 0.053,-0.04 c 0.048,-0.037 0.077,-0.061 0.111,-0.097 0.047,-0.05 0.084,-0.104 0.113,-0.162 0.029,-0.062 0.048,-0.125 0.057,-0.187 0.003,-0.02 0.005,-0.04 0.006,-0.06 L -1.654,8.021 V 1.566 C -1.142,1.001 -0.585,0.474 0,0" /></g><g
+           transform="translate(22.2707,17.571)"
+           id="g32"><path
+             id="path34"
+             style="fill:white;fill-opacity:0.5;fill-rule:nonzero;stroke:none"
+             d="m 0,0 v -0.008 l 0.011,0.019 v 0 z" /></g><g
+           transform="translate(40.657,22.3049)"
+           id="g36"><path
+             id="path38"
+             style="fill:white;fill-opacity:0.5;fill-rule:nonzero;stroke:none"
+             d="M 0,0 Z" /></g><g
+           transform="translate(49.1867,28.5134)"
+           id="g40"><path
+             id="path42"
+             style="fill:white;fill-opacity:0.5;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0.721,0.884 1.337,1.848 1.832,2.865 0.359,0.739 0.659,1.516 0.89,2.311 0.244,0.839 0.413,1.706 0.503,2.579 0.173,1.678 0.063,3.352 -0.329,4.976 -0.323,1.339 -0.834,2.625 -1.518,3.823 -0.416,0.728 -0.898,1.425 -1.432,2.072 -0.597,0.724 -1.268,1.394 -1.993,1.994 -0.636,0.525 -1.32,0.999 -2.034,1.409 -0.75,0.431 -1.539,0.796 -2.345,1.086 -1,0.359 -2.041,0.609 -3.095,0.743 -0.401,0.051 -0.808,0.086 -1.209,0.104 -0.205,0.009 -0.41,0.014 -0.615,0.015 h -0.098 c -0.479,-0.003 -0.943,-0.026 -1.379,-0.069 -0.825,-0.08 -1.65,-0.231 -2.451,-0.45 -0.861,-0.235 -1.705,-0.551 -2.509,-0.941 -0.765,-0.371 -1.502,-0.811 -2.191,-1.308 -0.571,-0.411 -1.115,-0.866 -1.618,-1.352 -0.236,-0.227 -0.471,-0.469 -0.698,-0.72 v -6.121 c 0.079,-0.052 0.161,-0.1 0.245,-0.144 0.07,-0.037 0.143,-0.071 0.216,-0.102 0.064,-0.027 0.13,-0.051 0.195,-0.074 0.394,-0.132 0.784,-0.158 1.127,-0.077 0.053,0.012 0.105,0.027 0.156,0.045 0.069,0.024 0.136,0.054 0.201,0.088 0.088,0.047 0.173,0.104 0.251,0.169 0.04,0.034 0.078,0.071 0.116,0.107 l 0.029,0.028 c 0.035,0.029 0.055,0.046 0.077,0.063 l 0.107,0.085 c 0.164,0.132 0.314,0.24 0.466,0.338 0.319,0.205 0.662,0.373 1.018,0.502 0.317,0.115 0.649,0.198 0.987,0.245 0.56,0.082 1.126,0.068 1.681,-0.038 0.51,-0.098 1,-0.273 1.455,-0.521 0.473,-0.257 0.901,-0.587 1.272,-0.981 0.394,-0.418 0.711,-0.894 0.942,-1.414 0.248,-0.558 0.392,-1.151 0.427,-1.762 0.037,-0.645 -0.052,-1.307 -0.258,-1.914 -0.22,-0.652 -0.583,-1.267 -1.049,-1.781 -0.491,-0.54 -1.105,-0.976 -1.776,-1.26 -0.352,-0.149 -0.724,-0.259 -1.106,-0.325 -0.421,-0.072 -0.849,-0.091 -1.272,-0.057 -0.371,0.03 -0.739,0.1 -1.09,0.21 -0.365,0.113 -0.716,0.267 -1.042,0.458 -0.167,0.096 -0.336,0.209 -0.503,0.334 -0.051,0.039 -0.102,0.078 -0.151,0.118 l -0.108,0.086 c -0.028,0.022 -0.053,0.043 -0.079,0.065 -0.03,0.028 -0.056,0.054 -0.082,0.079 -0.029,0.026 -0.061,0.054 -0.094,0.081 -0.064,0.05 -0.132,0.095 -0.201,0.133 -0.064,0.035 -0.132,0.065 -0.201,0.091 -0.051,0.018 -0.101,0.034 -0.154,0.046 C -20.829,6.024 -21.219,6 -21.613,5.873 -21.677,5.852 -21.742,5.828 -21.806,5.802 -21.887,5.768 -21.967,5.73 -22.045,5.689 -22.129,5.645 -22.21,5.598 -22.289,5.546 v -7.162 l 7.532,-0.003 c 0.02,-0.001 0.04,-0.002 0.06,-0.005 0.098,-0.015 0.192,-0.052 0.272,-0.107 0.026,-0.018 0.053,-0.039 0.076,-0.062 0.035,-0.033 0.058,-0.061 0.085,-0.096 l 0.053,-0.068 c 0.094,-0.125 0.184,-0.257 0.267,-0.395 0.362,-0.608 0.557,-1.269 0.563,-1.912 0.002,-0.099 -0.002,-0.198 -0.01,-0.298 -0.009,-0.11 -0.025,-0.221 -0.046,-0.33 -0.072,-0.362 -0.213,-0.711 -0.41,-1.008 -0.074,-0.11 -0.153,-0.214 -0.238,-0.309 -0.026,-0.029 -0.053,-0.057 -0.08,-0.086 l -0.025,-0.026 v 10e-4 l -0.18,-0.227 c -0.083,-0.106 -0.161,-0.219 -0.23,-0.334 -0.143,-0.233 -0.26,-0.483 -0.349,-0.744 -0.223,-0.654 -0.261,-1.359 -0.109,-2.037 0.084,-0.378 0.229,-0.742 0.429,-1.083 0.208,-0.351 0.47,-0.665 0.779,-0.932 0.323,-0.28 0.687,-0.5 1.081,-0.656 0.429,-0.17 0.884,-0.257 1.352,-0.26 h 0.026 c 0.482,0 0.951,0.09 1.397,0.269 0.473,0.19 0.913,0.483 1.274,0.848 0.383,0.388 0.682,0.862 0.865,1.371 0.203,0.566 0.267,1.184 0.184,1.786 -0.066,0.477 -0.221,0.931 -0.461,1.349 -0.117,0.204 -0.256,0.4 -0.413,0.584 l -0.073,0.089 0.005,0.01 -0.002,0.006 0.007,0.002 0.017,0.033 0.035,0.065 -0.091,-0.085 -0.053,0.057 c -0.051,0.06 -0.101,0.12 -0.148,0.182 -0.091,0.121 -0.173,0.253 -0.243,0.391 -0.067,0.13 -0.125,0.27 -0.172,0.417 -0.038,0.116 -0.068,0.239 -0.091,0.363 -0.018,0.097 -0.031,0.196 -0.039,0.294 -0.052,0.624 0.082,1.281 0.385,1.901 0.109,0.221 0.239,0.436 0.386,0.639 0.031,0.043 0.064,0.085 0.096,0.127 0.032,0.041 0.055,0.069 0.09,0.102 0.025,0.023 0.051,0.045 0.078,0.063 0.079,0.054 0.172,0.091 0.27,0.106 0.02,0.003 0.04,0.004 0.06,0.005 l 0.038,0.003 h 6.454 C -0.981,-1.113 -0.465,-0.57 0,0" /></g>
+          </g></g></g></svg>

apps/ios/cleverrc/index.html

@@ -0,0 +1,24 @@
+<html>
+	<head>
+		<meta name="apple-mobile-web-app-capable" content="yes" />
+		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
+		<link rel="stylesheet" href="main.css">
+		<script src="roslib.js"></script>
+	</head>
+	<body>
+		<div class="telemetry"><span class="mode">DISCONNECTED</span></div>
+		<div class="battery"></div>
+		<div class="logo"></div>
+		<div class="container">
+			<div class="stick stick-left">
+				<div class="stick-pointer"></div>
+			</div>
+			<div class="stick stick-right">
+				<div class="stick-pointer"></div>
+			</div>
+		</div>
+		<div class="notifications"></div>
+		<script src="main.js" type="text/javascript"></script>
+		<script src="telemetry.js" type="text/javascript"></script>
+	</body>
+</html>

apps/ios/cleverrc/main.css

@@ -0,0 +1,125 @@
+html, body {
+	margin: 0;
+	padding: 0;
+	user-select: none;
+	font-family: sans-serif;
+	background: #212121;
+	color: rgba(255, 255, 255, 0.9);
+}
+
+* {
+	user-select: none;
+}
+
+.stick {
+	border-radius: 50%;
+	width: 5cm;
+	height: 5cm;
+	position: relative;
+	transform: translateZ(0);
+	border: 4px solid rgba(255,255,255,.4);
+	box-shadow: 0 0 0 1px rgba(0,0,0,.2), inset 0 0 0 1px rgba(0,0,0,.2);
+}
+
+.stick-pointer {
+	position: absolute;
+	border-radius: 50%;
+	background-color: rgba(255,255,255,.25);
+	box-shadow: 0 0 10px rgba(0,0,0,.3);
+	width: 3cm;
+	height: 3cm;
+	margin-left: -1.5cm;
+	margin-top: -1.5cm;
+	top: 2.5cm;
+	left: 2.5cm;
+	pointer-events: none;
+	transform: translateZ(0);
+}
+
+.container {
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	width: 100%;
+	height: 100%;
+}
+
+.telemetry {
+	position: absolute;
+	text-align: center;
+	width: 100%;
+	top: 30px;
+	font-size: 20px;
+	user-select: none;
+	pointer-events: none;
+}
+
+body.armed .telemetry .mode {
+	font-weight: bold;
+}
+
+@keyframes scale {
+	0% { transform: scale(1.0); }
+	50% { transform: scale(1.2); }
+	100% { transform: scale(1.0); }
+}
+
+.battery {
+	position: absolute;
+	text-align: center;
+	width: 100%;
+	bottom: 30px;
+	font-size: 20px;
+	user-select: none;
+	pointer-events: none;
+}
+
+body.low-battery .battery {
+	color: #ff554b;
+	animation: scale 0.3s 1 ease-in-out
+}
+
+.logo {
+	position: absolute;
+	background: url(clever.svg);
+	-webkit-background-size: 50px;
+	background-size: 50px;
+	width: 50px;
+	height: 50px;
+	top: 50%;
+	left: 50%;
+	margin-top: -25px;
+	margin-left: -25px;
+	font-size: 20px;
+	user-select: none;
+	pointer-events: none;
+}
+
+.notifications {
+	pointer-events: none;
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	color: white;
+}
+
+.notifications.hidden {
+	transform: translateY(-100%);
+}
+
+.notifications.anim {
+	transition: transform 0.2s ease;
+}
+
+.notifications .item {
+	font-size: 4mm;
+	-webkit-text-size-adjust: none;
+	background: #fca83a;
+	padding: 3mm;
+	padding-bottom: 1.5mm;
+}
+
+.notifications .item:last-child {
+	padding-bottom: 3mm;
+}

apps/ios/cleverrc/main.js

@@ -0,0 +1,126 @@
+function throttle(func, ms) {
+	var isThrottled = false,
+		savedArgs,
+		savedThis;
+
+	function wrapper() {
+		if (isThrottled) {
+			savedArgs = arguments;
+			savedThis = this;
+			return;
+		}
+		func.apply(this, arguments);
+		isThrottled = true;
+		setTimeout(function() {
+			isThrottled = false;
+			if (savedArgs) {
+				wrapper.apply(savedThis, savedArgs);
+				savedArgs = savedThis = null;
+			}
+		}, ms);
+	}
+	return wrapper;
+}
+
+function callNativeApp(name, msg) {
+	try {
+		webkit.messageHandlers[name].postMessage(msg);
+		return true;
+	} catch(err) {
+		console.warn('The native context does not exist yet');
+		return false;
+	}
+}
+
+var rcLastPublish = null;
+
+function rcPublish() {
+	callNativeApp('control', controlMessage);
+	rcLastPublish = new Date();
+}
+
+rcPublishThrottled = throttle(rcPublish, 30);
+
+setInterval(function() {
+	if (rcLastPublish !== null && new Date() - rcLastPublish > 800) {
+		rcPublishThrottled();
+	}
+}, 50);
+
+var body = document.querySelector('body');
+var stickLeft = document.querySelector('.stick-left');
+var stickRight = document.querySelector('.stick-right');
+
+var controlMessage = { x: 0, y: 0, z: 0, r: 0 };
+
+function onStickTouchMove(touch) {
+	var target = touch.target;
+	var targetRect = target.getBoundingClientRect();
+	var stickPointer = target.querySelector('.stick-pointer');
+
+	var offsetX = touch.clientX - targetRect.left;
+	var offsetY = touch.clientY - targetRect.top;
+
+	var x = 2 * offsetX / targetRect.width;
+	var y = 2 * offsetY / targetRect.height;
+
+	x = Math.max(0, x);
+	x = Math.min(2, x);
+	y = Math.max(0, y);
+	y = Math.min(2, y);
+
+	stickPointer.style.left = (x * 50) + '%';
+	stickPointer.style.top = (y * 50) + '%';
+
+	x -= 1;
+	y = 1 - y;
+
+	if (target.matches('.stick-left')) {
+		controlMessage.z = Math.round((y + 1) * 500);
+		controlMessage.r = Math.round(x * 1000);
+	} else if (target.matches('.stick-right')) {
+		controlMessage.x = Math.round(y * 1000);
+		controlMessage.y = Math.round(x * 1000);
+	}
+}
+
+body.addEventListener('touchmove', function (e) {
+	e.preventDefault();
+});
+
+function stickTouchStart(e) {
+	setControlMode();
+	callNativeApp('controlStart');
+	onStickTouchMove(e.changedTouches[0]);
+	rcPublishThrottled();
+	e.stopPropagation();
+	e.preventDefault();
+}
+
+function stickTouchMove(e) {
+	onStickTouchMove(e.changedTouches[0]);
+	rcPublishThrottled();
+	e.stopPropagation();
+	e.preventDefault();
+}
+
+function stickTouchEnd(e) {
+	var pointer = e.target.querySelector('.stick-pointer');
+	if (e.target.matches('.stick-left')) {
+		controlMessage.r = 0;
+		pointer.style.left = '50%';
+	} else if (e.target.matches('.stick-right')) {
+		controlMessage.x = 0;
+		controlMessage.y = 0;
+		pointer.style.left = '50%';
+		pointer.style.top = '50%';
+	}
+	rcPublishThrottled();
+}
+
+stickLeft.addEventListener('touchmove', stickTouchMove);
+stickRight.addEventListener('touchmove', stickTouchMove);
+stickLeft.addEventListener('touchstart', stickTouchStart);
+stickRight.addEventListener('touchstart', stickTouchStart);
+stickLeft.addEventListener('touchend', stickTouchEnd);
+stickRight.addEventListener('touchend', stickTouchEnd);

apps/ios/cleverrc/telemetry.js

@@ -0,0 +1,115 @@
+var url = 'ws://192.168.11.1:9090';
+var modeEl = document.querySelector('.telemetry .mode');
+var batteryEl = document.querySelector('.battery');
+var notificationsEl = document.querySelector('.notifications');
+
+var ros = new ROSLIB.Ros({ url: url });
+
+ros.on('connection', function () {
+	body.classList.add('connected');
+});
+
+ros.on('close', function () {
+	body.classList.remove('connected');
+	modeEl.classList.remove('armed');
+	modeEl.innerHTML = 'DISCONNECTED';
+	batteryEl.innerHTML = '';
+	setTimeout(function() {
+		modeEl.innerHTML = 'RECONNECTING';
+		ros.connect(url);
+	}, 2000);
+});
+
+var fcuState;
+
+new ROSLIB.Topic({
+	ros: ros,
+	name: '/state_latched',
+	messageType: 'mavros_msgs/State'
+}).subscribe(function(message) {
+	body.classList.toggle('fcu-disconnected', !message.connected);
+	body.classList.toggle('armed', message.armed);
+	fcuState = message;
+	modeEl.classList.toggle('armed', fcuState.armed);
+	modeEl.innerHTML = message.connected ? fcuState.mode : 'DISCONNECTED FROM FCU';
+	console.log('state', message);
+});
+
+function notifyLowBattery() {
+	console.log('low battery');
+	callNativeApp('lowBattery');
+	body.classList.remove('low-battery');
+	void body.offsetWidth; // trick for repeating animation
+	body.classList.add('low-battery');
+}
+
+notifyLowBatteryThrottled = throttle(notifyLowBattery, 15000);
+
+new ROSLIB.Topic({
+	ros: ros,
+	name: '/mavros/battery',
+	messageType: 'sensor_msgs/BatteryState',
+	throttle_rate: 5000
+}).subscribe(function(message) {
+	var LOW_BATTERY = 3.8;
+	batteryEl.innerHTML = (message.cell_voltage[0].toFixed(2) + ' V') || '';
+
+	if (message.cell_voltage[0] < LOW_BATTERY) {
+		notifyLowBatteryThrottled();
+	} else {
+		body.classList.remove('low-battery');
+	}
+});
+
+var notificationHideTimer;
+
+function notify(text, severity) {
+	var item = document.createElement('div');
+	item.innerHTML = text;
+	item.classList.add('item');
+	notificationsEl.prepend(item);
+	var itemHeight = item.offsetHeight;
+	notificationsEl.classList.remove('anim');
+	notificationsEl.style.transform = 'translateY(' + -itemHeight + 'px)';
+	setTimeout(function() {
+		notificationsEl.classList.add('anim');
+		notificationsEl.style.transform = 'translateY(0)';
+	}, 0);
+	clearTimeout(notificationHideTimer);
+	notificationHideTimer = setTimeout(function() {
+		notificationsEl.style.transform = '';
+		notificationsEl.classList.add('hidden');
+		setTimeout(function() {
+			notificationsEl.innerHTML = '';
+		}, 210);
+	}, 4000);
+}
+
+new ROSLIB.Topic({
+	ros: ros,
+	name: '/mavros/statustext/recv',
+	messageType: 'mavros_msgs/StatusText'
+}).subscribe(function(message) {
+	var BLACKLIST = ['CMD: ', 'PR: ', 'DROPPED', 'Clock skew detected', 'MANUAL CONTROL LOST'];
+	if (message.severity <= 4) {
+		if (BLACKLIST.some(function(e) {
+				return message.text.indexOf(e) != -1;
+			})) {
+			console.log('Filtered out message ' + message.text);
+			return;
+		}
+		notify(message.text, message.severity);
+		callNativeApp('notification', message);
+	}
+});
+
+var setMode = new ROSLIB.Service({
+	ros: ros,
+	name : '/mavros/set_mode',
+	serviceType : 'mavros_msgs/SetMode'
+});
+
+function setControlMode() {
+	var CONTROL_MODE = 'STABILIZED';
+	setMode.callService(new ROSLIB.ServiceRequest({ custom_mode: CONTROL_MODE }));
+}

aruco_pose/src/aruco_pose.cpp

@@ -16,6 +16,11 @@
 #include <stdio.h>
 #include <tf/transform_broadcaster.h>
 
+#include "util.h"
+
+using std::vector;
+using std::string;
+
 namespace aruco_pose {
 
 class ArucoPose : public nodelet::Nodelet {
@@ -100,6 +105,45 @@ cv::Ptr<cv::aruco::Board> createCustomGridBoard(int markersX, int markersY, floa
     return res;
 }
 
+cv::Ptr<cv::aruco::Board> createCustomBoard(std::map<string, string> markers, const cv::Ptr<cv::aruco::Dictionary> &dictionary) {
+    cv::Ptr<cv::aruco::Board> res = cv::makePtr<cv::aruco::Board>();
+
+    res->dictionary = dictionary;
+
+    size_t total_markers = markers.size();
+    res->ids.reserve(total_markers);
+    res->objPoints.reserve(total_markers);
+
+    // Generate ids and objPoints
+    for(auto const &marker : markers) {
+        res->ids.push_back(std::stoi(marker.first));
+
+        vector<string> parts;
+        parts = strSplit(marker.second, " ");
+
+        float size = std::stof(parts.at(0));
+        float x = std::stof(parts.at(1));
+        float y = std::stof(parts.at(2));
+        float z = std::stof(parts.at(3));
+        float yaw = std::stof(parts.at(4));
+        float pitch = std::stof(parts.at(5));
+        float roll = std::stof(parts.at(6));
+
+        vector<cv::Point3f> corners;
+        corners.resize(4);
+        corners[0] = cv::Point3f(x - size / 2, y + size / 2, 0);
+        corners[1] = corners[0] + cv::Point3f(size, 0, 0);
+        corners[2] = corners[0] + cv::Point3f(size, -size, 0);
+        corners[3] = corners[0] + cv::Point3f(0, -size, 0);
+
+        // TODO: process yaw, pitch, roll
+
+        res->objPoints.push_back(corners);
+    }
+
+    return res;
+}
+
 #include "fix.cpp"
 
 void ArucoPose::createBoard()
@@ -178,8 +222,22 @@ void ArucoPose::createBoard()
     }
     else if (type == "custom")
     {
-        // Not implemented yet
-        ROS_FATAL("Custom boards are not implemented yet.");
+        ROS_INFO("Initialize a custom board");
+
+        std::map<string, string> markers;
+        nh_priv_.getParam("markers", markers);
+
+        board = createCustomBoard(markers, dictionary);
+
+        ROS_INFO("Draw a custom board");
+        // Publish map image for debugging
+        _drawPlanarBoard(board,  cv::Size(2000, 2000), map_image, 50, 1);
+
+        cv::cvtColor(map_image, map_image, CV_GRAY2BGR);
+
+        map_image_msg.encoding = sensor_msgs::image_encodings::BGR8;
+        map_image_msg.image = map_image;
+        map_image_pub.publish(map_image_msg.toImageMsg());
     }
     else
     {
@@ -214,10 +272,12 @@ void ArucoPose::detect(const sensor_msgs::ImageConstPtr& msg, const sensor_msgs:
     cv::Mat distCoeffs(8, 1, CV_64F);
     parseCameraInfo(cinfo, cameraMatrix, distCoeffs);
 
+    int valid = 0;
+    cv::Mat rvec, tvec, objPoints;
+
     if (markerIds.size() > 0) {
 
-        cv::Mat rvec, tvec, objPoints;
-        int valid = _estimatePoseBoard(markerCorners, markerIds, board, cameraMatrix, distCoeffs,
+        valid = _estimatePoseBoard(markerCorners, markerIds, board, cameraMatrix, distCoeffs,
                                        rvec, tvec, false, objPoints);
 
         if (valid) {
@@ -243,18 +303,16 @@ void ArucoPose::detect(const sensor_msgs::ImageConstPtr& msg, const sensor_msgs:
             ref_transform.setOrigin(ref_vector3);
             ref_transform.setRotation(q);
             br.sendTransform(ref_transform);
-
-            if(img_pub.getNumSubscribers() > 0)
-            {
-                // Publish debug image
-                cv::aruco::drawDetectedMarkers(image, markerCorners, markerIds);
-                cv::aruco::drawAxis(image, cameraMatrix, distCoeffs, rvec, tvec, 0.3);
-            }
         }
     }
 
     if (img_pub.getNumSubscribers() > 0)
     {
+        cv::aruco::drawDetectedMarkers(image, markerCorners, markerIds); // draw markers
+        if (valid)
+        {
+            cv::aruco::drawAxis(image, cameraMatrix, distCoeffs, rvec, tvec, 0.3); // draw board axis
+        }
         cv_bridge::CvImage out_msg;
         out_msg.header.frame_id = msg->header.frame_id;
         out_msg.header.stamp = msg->header.stamp;

aruco_pose/src/util.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <vector>
+#include <string>
+
+std::vector<std::string> strSplit(const std::string& str, const std::string& delim)
+{
+    std::vector<std::string> tokens;
+    size_t prev = 0, pos = 0;
+    do
+    {
+        pos = str.find(delim, prev);
+        if (pos == std::string::npos) pos = str.length();
+        std::string token = str.substr(prev, pos-prev);
+        if (!token.empty()) tokens.push_back(token);
+        prev = pos + delim.length();
+    }
+    while (pos < str.length() && prev < str.length());
+    return tokens;
+}

book.json

@@ -3,5 +3,20 @@
     "description": "Конструктор квадрокоптера «Клевер»",
     "author": "Copter Express",
     "language": "ru",
-    "plugins": ["youtube", "richquotes"]
-}
+    "root": "docs/",
+    "plugins": ["youtube", "richquotes", "versions", "yametrika"],
+    "pluginsConfig": {
+        "disqus": {
+            "shortName": "coex-clever"
+        },
+        "versions": {
+            "type": "tags"
+        },
+        "yametrika": {
+            "id": 49359238
+        }
+    },
+    "structure": {
+        "glossary": "_GLOSSARY.md"
+    }
+}

clever/CMakeLists.txt

@@ -11,6 +11,7 @@ find_package(catkin REQUIRED COMPONENTS
   nodelet
   pluginlib
   roscpp
+  genmsg
   rospy
   std_msgs
   message_generation
@@ -68,15 +69,11 @@ add_service_files(
   FILES
   GetTelemetry.srv
   Navigate.srv
+  NavigateGlobal.srv
   SetPosition.srv
-  SetPositionYawRate.srv
   SetPositionGlobal.srv
-  SetPositionGlobalYawRate.srv
   SetVelocity.srv
-  SetVelocityYawRate.srv
   SetAttitude.srv
-  SetAttitudeYawRate.srv
-  SetRatesYaw.srv
   SetRates.srv
 )
 
@@ -157,7 +154,9 @@ add_library(aruco_vpe
 ## Declare a C++ executable
 ## With catkin_make all packages are built within a single CMake context
 ## The recommended prefix ensures that target names across packages don't collide
-# add_executable(${PROJECT_NAME}_node src/clever_node.cpp)
+add_executable(rc src/rc.cpp)
+
+target_link_libraries(rc ${catkin_LIBRARIES})
 
 ## Rename C++ executable without prefix
 ## The above recommended prefix causes long target names, the following renames the

clever/launch/clever.launch

@@ -3,11 +3,12 @@
     <arg name="fcu_ip" default="127.0.0.1"/>
     <arg name="gcs_bridge" default="tcp"/>
     <arg name="viz" default="true"/>
-    <arg name="web_server" default="false"/>
+    <arg name="web_server" default="true"/>
     <arg name="web_video_server" default="true"/>
     <arg name="rosbridge" default="true"/>
     <arg name="main_camera" default="true"/>
     <arg name="aruco" default="false"/>
+    <arg name="rc" value="true"/>
     <arg name="fpv_camera" default="false"/>
     <arg name="fpv_camera_device" default="/dev/v4l/by-id/usb-HD_Camera_Manufacturer_USB_2.0_Camera-video-index0"/>
     <arg name="arduino" default="false"/>
@@ -20,8 +21,9 @@
         <arg name="viz" value="$(arg viz)"/>
     </include>
 
-    <!-- web server -->
-    <include file="$(find clever)/launch/web_server.launch" if="$(arg web_server)"/>
+
+    <!-- web server, serving /home/pi/catkin_ws/src/clever/clever/static -->
+    <node name="web_server" pkg="clever" type="monkey" output="screen" if="$(arg web_server)"/>
 
     <!-- web video server -->
     <node name="web_video_server" pkg="web_video_server" type="web_video_server" if="$(arg web_video_server)" required="false" respawn="true" respawn_delay="5"/>
@@ -46,7 +48,10 @@
     <include file="$(find clever)/launch/main_camera.launch" if="$(arg main_camera)"/>
 
     <!-- rosbridge -->
-    <include file="$(find rosbridge_server)/launch/rosbridge_websocket.launch" if="$(arg rosbridge)"/>
+    <include file="$(find rosbridge_server)/launch/rosbridge_websocket.launch" if="$(eval rosbridge or rc)"/>
+
+    <!-- rc backend -->
+    <node name="rc" pkg="clever" type="rc" output="screen" if="$(arg rc)"/>
 
     <!-- FPV video streaming -->
     <include file="$(find clever)/launch/fpv_camera.launch" if="$(arg fpv_camera)">

clever/launch/mavros.launch

@@ -3,8 +3,9 @@
     <arg name="fcu_ip" default="127.0.0.1"/>
     <arg name="gcs_bridge" default="tcp"/>
     <arg name="viz" default="true"/>
+    <arg name="respawn" default="true"/>
 
-    <node pkg="mavros" type="mavros_node" name="mavros" required="false" clear_params="true" output="screen">
+    <node pkg="mavros" type="mavros_node" name="mavros" required="false" clear_params="true" respawn="$(arg respawn)" respawn_delay="5" output="screen">
             <!-- UART connection -->
             <param name="fcu_url" value="/dev/ttyAMA0:921600" if="$(eval fcu_conn is None or fcu_conn == 'uart')"/>
 
@@ -16,8 +17,12 @@
 
             <!-- gcs bridge -->
             <param name="gcs_url" value="tcp-l://0.0.0.0:5760" if="$(eval gcs_bridge == 'tcp')"/>
-            <param name="gcs_url" value="udp://@192.168.11.14:14550" if="$(eval gcs_bridge == 'udp')"/> <!-- TODO: fix -->
+            <param name="gcs_url" value="udp://0.0.0.0:14550@14550" if="$(eval gcs_bridge == 'udp')"/>
+            <param name="gcs_url" value="udp-b://$(env ROS_IP):14550@14550" if="$(eval gcs_bridge == 'udp-b')"/>
+            <param name="gcs_url" value="udp-pb://$(env ROS_IP):14550@14550" if="$(eval gcs_bridge == 'udp-pb')"/>
             <param name="gcs_url" value="" if="$(eval not gcs_bridge)"/>
+            <param name="gcs_quiet_mode" value="true"/>
+            <param name="conn/timeout" value="8"/>
 
             <!-- default px4 params -->
             <rosparam command="load" file="$(find mavros)/launch/px4_config.yaml"/>
@@ -28,6 +33,7 @@
             <param name="local_position/tf/frame_id" value="local_origin"/>
             <param name="local_position/tf/child_frame_id" value="fcu"/>
             <param name="global_position/tf/send" value="false"/>
+            <param name="imu/frame_id" value="fcu"/>
             <rosparam param="plugin_blacklist">
                 - safety_area
                 - image_pub
@@ -37,7 +43,6 @@
                 - 3dr_radio
                 - actuator_control
                 - hil_controls
-                - manual_control
                 - vfr_hud
                 - px4flow
                 - vision_speed_estimate

clever/launch/sitl.launch

@@ -7,11 +7,11 @@
         <arg name="fcu_conn" value="udp"/>
         <arg name="fcu_ip" value="$(arg ip)"/>
         <arg name="gcs_bridge" value="false"/>
+        <arg name="web_server" default="false"/>
         <arg name="web_video_server" default="false"/>
         <arg name="main_camera" default="false"/>
         <arg name="fpv_camera" default="false"/>
         <arg name="rosbridge" value="$(arg rosbridge)"/>
-        <arg name="web_server" default="false"/>
         <arg name="aruco" default="false"/>
     </include>
 </launch>

clever/launch/web_server.launch

@@ -1,5 +0,0 @@
-<launch>
-    <node name="web_server" pkg="clever" type="web_server.py" output="screen">
-        <param name="path" value="$(find clever)/static"/>
-    </node>
-</launch>

clever/requirements.txt

@@ -1,2 +1,3 @@
 flask==0.12.2
 geopy==1.11.0
+pymavlink==2.2.10

clever/src/aruco_vpe.cpp

@@ -20,14 +20,15 @@ using std::string;
 class ArucoVPE : public nodelet::Nodelet
 {
 public:
-    ArucoVPE() : 
+    ArucoVPE() :
         last_published_(0),
         lookup_timeout_(0.05)
     {}
 
-private:    
+private:
     ros::Time last_published_;
     ros::Duration lookup_timeout_;
+    ros::Duration reset_timeout_;
     ros::Publisher vision_position_pub_;
     ros::Timer dummy_vision_timer_;
     string aruco_orientation_;
@@ -42,6 +43,9 @@ private:
         bool use_mocap;
         nh_priv.param<bool>("use_mocap", use_mocap, false);
         nh_priv.param<bool>("reset_vpe", reset_vpe_, !use_mocap);
+        double reset_timeout;
+        nh_priv.param("reset_timeout", reset_timeout, 2.0);
+        reset_timeout_ = ros::Duration(reset_timeout);
 
         static ros::Subscriber pose_sub = nh.subscribe("mavros/local_position/pose", 1, &ArucoVPE::handlePose, this);
         static ros::Subscriber aruco_pose_sub = nh.subscribe("aruco_pose/pose", 1, &ArucoVPE::handleArucoPose, this);
@@ -100,7 +104,7 @@ private:
             br.sendTransform(t);
 
             if (last_published_.toSec() == 0 || // no vpe has been posted
-               (reset_vpe_ && (ros::Time::now() - last_published_ > ros::Duration(2)))) // vpe origin outdated
+               (reset_vpe_ && (ros::Time::now() - last_published_ > reset_timeout_))) // vpe origin outdated
             {
                 ROS_INFO("Reset VPE");
                 t = tf_buffer.lookupTransform("local_origin", "aruco_map_vision", stamp, lookup_timeout_);

clever/src/global_local.py

@@ -9,8 +9,15 @@ from sensor_msgs.msg import NavSatFix
 def global_to_local(lat, lon):
     # TODO: refactor
 
-    position_global = rospy.wait_for_message('mavros/global_position/global', NavSatFix, timeout=5)
-    pose = rospy.wait_for_message('mavros/local_position/pose', PoseStamped, timeout=5)
+    try:
+        position_global = rospy.wait_for_message('mavros/global_position/global', NavSatFix, timeout=0.5)
+    except rospy.exceptions.ROSException:
+        raise Exception('No global position')
+
+    try:
+        pose = rospy.wait_for_message('mavros/local_position/pose', PoseStamped, timeout=0.5)
+    except rospy.exceptions.ROSException:
+        raise Exception('No local position')
 
     d = math.hypot(pose.pose.position.x, pose.pose.position.y)
 

clever/src/monkey

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+exec /home/pi/monkey/build/monkey --port 80

clever/src/rc.cpp

@@ -0,0 +1,173 @@
+// CLEVER mobile remote control support:
+// * Send ManualControl messages through UDP
+// * `latched_state` topic
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <errno.h>
+#include <thread>
+#include "ros/ros.h"
+#include "std_msgs/String.h"
+#include "mavros_msgs/State.h"
+#include "mavros_msgs/ManualControl.h"
+#include "mavros_msgs/Mavlink.h"
+
+struct ControlMessage
+{
+    int16_t x, y, z, r;
+} __attribute__((packed));
+
+class RC
+{
+public:
+    RC():
+        nh(),
+        nh_priv("~")
+    {
+        // Create socket thread
+        std::thread t(&RC::socketThread, this);
+        t.detach();
+
+        std::thread gcst(&RC::fakeGCSThread, this);
+        gcst.detach();
+
+        initLatchedState();
+    }
+
+private:
+    ros::NodeHandle nh, nh_priv;
+    ros::Subscriber state_sub;
+    ros::Publisher state_pub;
+    ros::Timer state_timeout_timer;
+    ros::Time last_manual_control{0};
+    mavros_msgs::StateConstPtr state_msg;
+
+    void handleState(const mavros_msgs::StateConstPtr& state)
+    {
+        state_timeout_timer.setPeriod(ros::Duration(3), true);
+        state_timeout_timer.start();
+
+        if (!state_msg ||
+            state->connected != state_msg->connected ||
+            state->mode != state_msg->mode ||
+            state->armed != state_msg->armed) {
+                state_msg = state;
+                state_pub.publish(state_msg);
+            }
+    }
+
+    void stateTimedOut(const ros::TimerEvent&)
+    {
+        ROS_INFO("State timeout");
+        mavros_msgs::State unknown_state;
+        state_pub.publish(unknown_state);
+        state_msg = nullptr;
+    }
+
+    void initLatchedState()
+    {
+        state_sub = nh.subscribe("mavros/state", 1, &RC::handleState, this);
+        state_pub = nh.advertise<mavros_msgs::State>("state_latched", 1, true);
+        state_timeout_timer = nh.createTimer(ros::Duration(0), &RC::stateTimedOut, this, true, false);
+
+        // Publish initial state
+        mavros_msgs::State unknown_state;
+        state_pub.publish(unknown_state);
+    }
+
+    void fakeGCSThread()
+    {
+        // Awful workaround for fixing PX4 not sending STATUSTEXTs
+        // if there is no GCS hearbeats.
+        // TODO: use timer
+        // TODO: remove, when PX4 get this fixed.
+        ros::Publisher mavlink_pub = nh.advertise<mavros_msgs::Mavlink>("mavlink/to", 1);
+
+        // HEARTBEAT from GCS message
+        mavros_msgs::Mavlink hb;
+        hb.framing_status = mavros_msgs::Mavlink::FRAMING_OK;
+        hb.magic = mavros_msgs::Mavlink::MAVLINK_V20;
+        hb.len = 9;
+        hb.incompat_flags = 0;
+        hb.compat_flags = 0;
+        hb.seq = 0;
+        hb.sysid = 255;
+        hb.compid = 0;
+        hb.checksum = 26460;
+        hb.payload64.push_back(342282393542983680);
+        hb.payload64.push_back(3);
+
+        ros::Rate rate(1);
+        while (ros::ok()) {
+            if (ros::Time::now() - last_manual_control < ros::Duration(8)) {
+                mavlink_pub.publish(hb);
+            }
+            rate.sleep();
+        }
+    }
+
+    int createSocket(int port)
+    {
+        int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+
+        sockaddr_in sin;
+        sin.sin_family = AF_INET;
+        sin.sin_addr.s_addr = htonl(INADDR_ANY);
+        sin.sin_port = htons(port);
+
+        if (bind(sockfd, (sockaddr *)&sin, sizeof(sin)) < 0) {
+            ROS_FATAL("socket bind error: %s", strerror(errno));
+            close(sockfd);
+            ros::shutdown();
+        }
+
+        return sockfd;
+    }
+
+    void socketThread()
+    {
+        int port;
+        nh_priv.param("port", port, 35602);
+        int sockfd = createSocket(port);
+
+        char buff[9999];
+
+        ros::Publisher manual_control_pub = nh.advertise<mavros_msgs::ManualControl>("mavros/manual_control/send", 1);
+        mavros_msgs::ManualControl manual_control_msg;
+
+        sockaddr_in client_addr;
+        socklen_t client_addr_size = sizeof(client_addr);
+
+        ROS_INFO("UDP RC initialized on port %d", port);
+
+        while (true) {
+            // read next UDP packet
+            int bsize = recvfrom(sockfd, &buff[0], sizeof(buff) - 1, 0, (sockaddr *) &client_addr, &client_addr_size);
+
+            if (bsize < 0) {
+                ROS_ERROR("recvfrom() error: %s", strerror(errno));
+            } else if (bsize != sizeof(ControlMessage)) {
+                ROS_ERROR_THROTTLE(30, "Wrong UDP packet size: %d", bsize);
+            }
+
+            // unpack message
+            // warning: ignore endianness, so the code is platform-dependent
+            ControlMessage *msg = (ControlMessage *)buff;
+
+            manual_control_msg.x = msg->x;
+            manual_control_msg.y = msg->y;
+            manual_control_msg.z = msg->z;
+            manual_control_msg.r = msg->r;
+            manual_control_pub.publish(manual_control_msg);
+
+            last_manual_control = ros::Time::now();
+        }
+    }
+};
+
+int main(int argc, char **argv)
+{
+    ros::init(argc, argv, "rc");
+    RC rc;
+    ros::spin();
+}

clever/src/selfcheck.py

@@ -0,0 +1,109 @@
+#!/usr/bin/env python
+
+import rospy
+from std_srvs.srv import Trigger
+from sensor_msgs.msg import Image, CameraInfo, NavSatFix, Imu
+from mavros_msgs.msg import State
+from geometry_msgs.msg import PoseStamped, TwistStamped
+
+
+# TODO: roscore is running
+# TODO: local_origin, fcu, fcu_horiz
+# TODO: rc service
+# TODO: perform commander check in PX4
+
+
+rospy.init_node('selfcheck')
+
+
+def check_fcu():
+    try:
+        state = rospy.wait_for_message('mavros/state', State, timeout=3)
+        if not state.connected:
+            raise Exception('No connection to the FCU')
+    except rospy.ROSException:
+        raise Exception('No MAVROS state')
+
+
+def check_camera(name):
+    try:
+        rospy.wait_for_message(name + '/image_raw', Image, timeout=1)
+    except rospy.ROSException:
+        raise Exception('No %s camera images' % name)
+    try:
+        rospy.wait_for_message(name + '/camera_info', CameraInfo, timeout=3)
+    except rospy.ROSException:
+        raise Exception('No %s camera camera info' % name)
+
+def check_aruco():
+    try:
+        rospy.wait_for_message('aruco_pose/debug', Image, timeout=1)
+    except rospy.ROSException:
+        raise Exception('No aruco_pose/debug topic')
+
+
+def check_simpleoffboard():
+    try:
+        rospy.wait_for_service('navigate', timeout=3)
+        rospy.wait_for_service('get_telemetry', timeout=3)
+        rospy.wait_for_service('land', timeout=3)
+    except rospy.ROSException:
+        raise Exception('No simple_offboard services')
+
+
+def check_imu():
+    try:
+        rospy.wait_for_message('mavros/imu/data', Imu, timeout=1)
+    except rospy.ROSException:
+        raise Exception('No IMU data')
+
+
+def check_local_position():
+    try:
+        rospy.wait_for_message('mavros/local_position/pose', PoseStamped, timeout=1)
+    except rospy.ROSException:
+        raise Exception('No local position')
+
+
+def check_velocity():
+    try:
+        velocity = rospy.wait_for_message('mavros/local_position/velocity', TwistStamped, timeout=1)
+        horiz = math.hypot(velocity.twist.linear.x, velocity.twist.linear.y)
+        vert = velocity.twist.linear.z
+        if abs(horiz) > 0.1:
+            raise Exception('Horizontal velocity estimation is %s m/s; is the copter staying still?' % horiz)
+        if abs(vert) > 0.1:
+            raise Exception('Vertical velocity estimation is %s m/s; is the copter staying still?' % vert)
+    except rospy.ROSException:
+        raise Exception('No velocity estimation')
+
+
+def check_global_position():
+    try:
+        rospy.wait_for_message('mavros/global_position/global', PoseStamped, timeout=3)
+    except rospy.ROSException:
+        raise Exception('No global position')
+
+
+def check(name, fn):
+    try:
+        fn()
+        rospy.loginfo('%s: OK', name)
+    except Exception as e:
+        rospy.logwarn('%s: %s', name, str(e))
+
+
+def selfcheck():
+    check('FCU', check_fcu)
+    check('Simple offboard node', check_simpleoffboard)
+    check('Main camera node', lambda: check_camera('main_camera'))
+    check('aruco_pose/debug topic', check_aruco)
+    check('IMU data', check_imu)
+    check('Local position', check_local_position)
+    check('Velocity estimation', check_velocity)
+    check('Global position (GPS)', check_global_position)
+
+
+if __name__ == '__main__':
+    rospy.loginfo('Performing selfcheck...')
+    selfcheck()

clever/src/simple_offboard.py

@@ -2,7 +2,8 @@
 from __future__ import division
 
 import rospy
-from geometry_msgs.msg import TransformStamped, PoseStamped, Point, PointStamped, Vector3, Vector3Stamped, TwistStamped, QuaternionStamped
+from geometry_msgs.msg import TransformStamped, PoseStamped, Point, PointStamped, Vector3, \
+    Vector3Stamped, TwistStamped, QuaternionStamped
 from sensor_msgs.msg import NavSatFix, BatteryState
 import tf2_ros
 import tf2_geometry_msgs
@@ -75,12 +76,20 @@ rospy.Subscriber('/mavros/global_position/global', NavSatFix, global_position_up
 rospy.Subscriber('/mavros/battery', BatteryState, battery_update)
 
 
+PT = PositionTarget
+AT = AttitudeTarget
 AUTO_OFFBOARD = rospy.get_param('~auto_offboard', True)
 AUTO_ARM = AUTO_OFFBOARD and rospy.get_param('~auto_arm', True)
 OFFBOARD_TIMEOUT = rospy.Duration(rospy.get_param('~offboard_timeout', 3))
 ARM_TIMEOUT = rospy.Duration(rospy.get_param('~arm_timeout', 5))
+LOCAL_POSITION_TIMEOUT = rospy.Duration(rospy.get_param('~local_position_timeout', 0.5))
+NAVIGATE_AFTER_ARMED = rospy.Duration(rospy.get_param('~navigate_after_armed', True))
 TRANSFORM_TIMEOUT = rospy.Duration(rospy.get_param('~transform_timeout', 3))
 SETPOINT_RATE = rospy.get_param('~setpoint_rate', 30)
+LOCAL_FRAME = rospy.get_param('~local_frame', 'local_origin')
+LAND_MODE = rospy.get_param('~land_mode', 'AUTO.LAND')
+LAND_TIMEOUT = rospy.Duration(rospy.get_param('~land_timeout', 2))
+DEFAULT_SPEED = rospy.get_param('~default_speed', 0.5)
 
 
 def offboard_and_arm():
@@ -95,6 +104,7 @@ def offboard_and_arm():
                 break
             if rospy.get_rostime() - start > OFFBOARD_TIMEOUT:
                 raise Exception('OFFBOARD request timed out')
+            rospy.sleep(0.1)
 
     if AUTO_ARM and not state.armed:
         rospy.loginfo('Arming')
@@ -104,9 +114,9 @@ def offboard_and_arm():
         while True:
             if state.armed:
                 return True
-
             if rospy.get_rostime() - start > ARM_TIMEOUT:
                 raise Exception('Arming timed out')
+            rospy.sleep(0.1)
 
 
 ps = PoseStamped()
@@ -149,143 +159,84 @@ def get_publisher_and_message(req, stamp, continued=True, update_frame=True):
     ps.header.stamp = stamp
     vs.header.stamp = stamp
 
-    if isinstance(req, srv.NavigateRequest):
+    if isinstance(req, (srv.NavigateRequest, srv.NavigateGlobalRequest)):
         global current_nav_start, current_nav_start_stamp, current_nav_finish
 
         if update_frame:
-            ps.header.frame_id = req.frame_id or 'local_origin'
-            ps.pose.position = Point(req.x, req.y, req.z)
-            ps.pose.orientation = orientation_from_euler(0, 0, req.yaw)
-            current_nav_finish = tf_buffer.transform(ps, 'local_origin', TRANSFORM_TIMEOUT)
+            ps.header.frame_id = req.frame_id or LOCAL_FRAME
+            ps.pose.position = Point(getattr(req, 'x', 0), getattr(req, 'y', 0), req.z)
+            ps.pose.orientation = orientation_from_euler(0, 0, req.yaw, axes='sxyz')
+            current_nav_finish = tf_buffer.transform(ps, LOCAL_FRAME, TRANSFORM_TIMEOUT)
+
+            if isinstance(req, srv.NavigateGlobalRequest):
+                # Recalculate x and y from lat and lon
+                current_nav_finish.pose.position.x, current_nav_finish.pose.position.y = \
+                    global_to_local(req.lat, req.lon)
 
         if not continued:
             current_nav_start = pose.pose.position
             current_nav_start_stamp = stamp
 
+        if NAVIGATE_AFTER_ARMED and not state.armed:
+            current_nav_start_stamp = stamp
+
         setpoint = get_navigate_setpoint(stamp, current_nav_start, current_nav_finish.pose.position,
                                          current_nav_start_stamp, req.speed)
 
-        msg = PositionTarget(coordinate_frame=PositionTarget.FRAME_LOCAL_NED,
-                             type_mask=PositionTarget.IGNORE_VX + PositionTarget.IGNORE_VY + PositionTarget.IGNORE_VZ +
-                                       PositionTarget.IGNORE_AFX + PositionTarget.IGNORE_AFY + PositionTarget.IGNORE_AFZ +
-                                       PositionTarget.IGNORE_YAW_RATE,
+        yaw_rate_flag = math.isnan(req.yaw)
+        msg = PositionTarget(coordinate_frame=PT.FRAME_LOCAL_NED,
+                             type_mask=PT.IGNORE_VX + PT.IGNORE_VY + PT.IGNORE_VZ +
+                                       PT.IGNORE_AFX + PT.IGNORE_AFY + PT.IGNORE_AFZ +
+                                       (PT.IGNORE_YAW if yaw_rate_flag else PT.IGNORE_YAW_RATE),
                              position=setpoint,
-                             yaw=euler_from_orientation(current_nav_finish.pose.orientation)[2] - math.pi / 2)
-        return position_pub, msg
-
-    elif isinstance(req, srv.SetPositionRequest):
-        ps.header.frame_id = req.frame_id or 'local_origin'
-        ps.pose.position = Point(req.x, req.y, req.z)
-        ps.pose.orientation = orientation_from_euler(0, 0, req.yaw)
-        pose_local = tf_buffer.transform(ps, 'local_origin', TRANSFORM_TIMEOUT)
-
-        msg = PositionTarget(coordinate_frame=PositionTarget.FRAME_LOCAL_NED,
-                             type_mask=PositionTarget.IGNORE_VX + PositionTarget.IGNORE_VY + PositionTarget.IGNORE_VZ +
-                                       PositionTarget.IGNORE_AFX + PositionTarget.IGNORE_AFY + PositionTarget.IGNORE_AFZ +
-                                       PositionTarget.IGNORE_YAW_RATE,
-                             position=pose_local.pose.position,
-                             yaw=euler_from_orientation(pose_local.pose.orientation)[2] - math.pi / 2)
-        return position_pub, msg
-
-    elif isinstance(req, srv.SetPositionYawRateRequest):
-        ps.header.frame_id = req.frame_id or 'local_origin'
-        ps.pose.position = Point(req.x, req.y, req.z)
-        pose_local = tf_buffer.transform(ps, 'local_origin', TRANSFORM_TIMEOUT)
-        msg = PositionTarget(coordinate_frame=PositionTarget.FRAME_LOCAL_NED,
-                             type_mask=PositionTarget.IGNORE_VX + PositionTarget.IGNORE_VY + PositionTarget.IGNORE_VZ +
-                                       PositionTarget.IGNORE_AFX + PositionTarget.IGNORE_AFY + PositionTarget.IGNORE_AFZ +
-                                       PositionTarget.IGNORE_YAW,
-                             position=pose_local.pose.position,
+                             yaw=euler_from_orientation(current_nav_finish.pose.orientation, 'sxyz')[2],
                              yaw_rate=req.yaw_rate)
         return position_pub, msg
 
-    elif isinstance(req, srv.SetPositionGlobalRequest):
-        x, y = global_to_local(req.lat, req.lon)
-
-        ps.header.frame_id = req.frame_id or 'local_origin'
-        ps.pose.position = Point(0, 0, req.z)
+    elif isinstance(req, (srv.SetPositionRequest, srv.SetPositionGlobalRequest)):
+        ps.header.frame_id = req.frame_id or LOCAL_FRAME
+        ps.pose.position = Point(getattr(req, 'x', 0), getattr(req, 'y', 0), req.z)
         ps.pose.orientation = orientation_from_euler(0, 0, req.yaw)
-        pose_local = tf_buffer.transform(ps, 'local_origin', TRANSFORM_TIMEOUT)
-        pose_local.pose.position.x = x
-        pose_local.pose.position.y = y
+        pose_local = tf_buffer.transform(ps, LOCAL_FRAME, TRANSFORM_TIMEOUT)
 
-        msg = PositionTarget(coordinate_frame=PositionTarget.FRAME_LOCAL_NED,
-                             type_mask=PositionTarget.IGNORE_VX + PositionTarget.IGNORE_VY + PositionTarget.IGNORE_VZ +
-                                       PositionTarget.IGNORE_AFX + PositionTarget.IGNORE_AFY + PositionTarget.IGNORE_AFZ +
-                                       PositionTarget.IGNORE_YAW_RATE,
-                             position=pose_local.pose.position,
-                             yaw=euler_from_orientation(pose_local.pose.orientation)[2] - math.pi / 2)
-        return position_pub, msg
-
-    elif isinstance(req, srv.SetPositionGlobalYawRateRequest):
-        x, y = global_to_local(req.lat, req.lon)
-
-        ps.header.frame_id = req.frame_id or 'local_origin'
-        ps.pose.position = Point(0, 0, req.z)
-        pose_local = tf_buffer.transform(ps, 'local_origin', TRANSFORM_TIMEOUT)
-        pose_local.pose.position.x = x
-        pose_local.pose.position.y = y
-
-        msg = PositionTarget(coordinate_frame=PositionTarget.FRAME_LOCAL_NED,
-                             type_mask=PositionTarget.IGNORE_VX + PositionTarget.IGNORE_VY + PositionTarget.IGNORE_VZ +
-                                       PositionTarget.IGNORE_AFX + PositionTarget.IGNORE_AFY + PositionTarget.IGNORE_AFZ +
-                                       PositionTarget.IGNORE_YAW,
+        if isinstance(req, srv.SetPositionGlobalRequest):
+            pose_local.pose.position.x, pose_local.pose.position.y = global_to_local(req.lat, req.lon)
+
+        yaw_rate_flag = math.isnan(req.yaw)
+        msg = PositionTarget(coordinate_frame=PT.FRAME_LOCAL_NED,
+                             type_mask=PT.IGNORE_VX + PT.IGNORE_VY + PT.IGNORE_VZ +
+                                       PT.IGNORE_AFX + PT.IGNORE_AFY + PT.IGNORE_AFZ +
+                                       (PT.IGNORE_YAW if yaw_rate_flag else PT.IGNORE_YAW_RATE),
                              position=pose_local.pose.position,
+                             yaw=euler_from_orientation(pose_local.pose.orientation, 'sxyz')[2],
                              yaw_rate=req.yaw_rate)
         return position_pub, msg
 
     elif isinstance(req, srv.SetVelocityRequest):
         vs.vector = Vector3(req.vx, req.vy, req.vz)
-        vs.header.frame_id = req.frame_id or 'local_origin'
-        ps.header.frame_id = req.frame_id or 'local_origin'
+        vs.header.frame_id = req.frame_id or LOCAL_FRAME
+        ps.header.frame_id = req.frame_id or LOCAL_FRAME
         ps.pose.orientation = orientation_from_euler(0, 0, req.yaw)
-        pose_local = tf_buffer.transform(ps, 'local_origin', TRANSFORM_TIMEOUT)
-        vector_local = tf_buffer.transform(vs, 'local_origin', TRANSFORM_TIMEOUT)
-        msg = PositionTarget(coordinate_frame=PositionTarget.FRAME_LOCAL_NED,
-                             type_mask=PositionTarget.IGNORE_PX + PositionTarget.IGNORE_PY + PositionTarget.IGNORE_PZ +
-                                       PositionTarget.IGNORE_AFX + PositionTarget.IGNORE_AFY + PositionTarget.IGNORE_AFZ +
-                                       PositionTarget.IGNORE_YAW_RATE,
-                             velocity=vector_local.vector,
-                             yaw=euler_from_orientation(pose_local.pose.orientation)[2] - math.pi / 2)
-        return position_pub, msg
+        pose_local = tf_buffer.transform(ps, LOCAL_FRAME, TRANSFORM_TIMEOUT)
+        vector_local = tf_buffer.transform(vs, LOCAL_FRAME, TRANSFORM_TIMEOUT)
 
-    elif isinstance(req, srv.SetVelocityYawRateRequest):
-        vs.vector = Vector3(req.vx, req.vy, req.vz)
-        vs.header.frame_id = req.frame_id or 'local_origin'
-        vector_local = tf_buffer.transform(vs, 'local_origin', TRANSFORM_TIMEOUT)
-        msg = PositionTarget(coordinate_frame=PositionTarget.FRAME_LOCAL_NED,
-                             type_mask=PositionTarget.IGNORE_PX + PositionTarget.IGNORE_PY + PositionTarget.IGNORE_PZ +
-                                       PositionTarget.IGNORE_AFX + PositionTarget.IGNORE_AFY + PositionTarget.IGNORE_AFZ +
-                                       PositionTarget.IGNORE_YAW,
+        yaw_rate_flag = math.isnan(req.yaw)
+        msg = PositionTarget(coordinate_frame=PT.FRAME_LOCAL_NED,
+                             type_mask=PT.IGNORE_PX + PT.IGNORE_PY + PT.IGNORE_PZ +
+                                       PT.IGNORE_AFX + PT.IGNORE_AFY + PT.IGNORE_AFZ +
+                                       (PT.IGNORE_YAW if yaw_rate_flag else PT.IGNORE_YAW_RATE),
                              velocity=vector_local.vector,
+                             yaw=euler_from_orientation(pose_local.pose.orientation, 'sxyz')[2],
                              yaw_rate=req.yaw_rate)
         return position_pub, msg
 
     elif isinstance(req, srv.SetAttitudeRequest):
-        ps.header.frame_id = req.frame_id or 'local_origin'
+        ps.header.frame_id = req.frame_id or LOCAL_FRAME
         ps.pose.orientation = orientation_from_euler(req.roll, req.pitch, req.yaw)
-        pose_local = tf_buffer.transform(ps, 'local_origin', TRANSFORM_TIMEOUT)
+        pose_local = tf_buffer.transform(ps, LOCAL_FRAME, TRANSFORM_TIMEOUT)
         msg = AttitudeTarget(orientation=pose_local.pose.orientation,
                              thrust=req.thrust,
-                             type_mask=AttitudeTarget.IGNORE_YAW_RATE + AttitudeTarget.IGNORE_PITCH_RATE +
-                                       AttitudeTarget.IGNORE_ROLL_RATE)
-        return attitude_pub, msg
-
-    elif isinstance(req, srv.SetAttitudeYawRateRequest):
-        msg = AttitudeTarget(orientation=orientation_from_euler(req.roll, req.pitch, 0),
-                             thrust=req.thrust,
-                             type_mask=AttitudeTarget.IGNORE_PITCH_RATE + AttitudeTarget.IGNORE_ROLL_RATE)
-        msg.body_rate.z = req.yaw_rate
-        return attitude_pub, msg
-
-    elif isinstance(req, srv.SetRatesYawRequest):
-        ps.header.frame_id = req.frame_id or 'local_origin'
-        ps.pose.orientation = orientation_from_euler(0, 0, req.yaw)
-        pose_local = tf_buffer.transform(ps, 'local_origin', TRANSFORM_TIMEOUT)
-        msg = AttitudeTarget(orientation=pose_local.pose.orientation,
-                             thrust=req.thrust,
-                             type_mask=AttitudeTarget.IGNORE_YAW_RATE,
-                             body_rate=Vector3(req.roll_rate, req.pitch_rate, 0))
+                             type_mask=AT.IGNORE_YAW_RATE + AT.IGNORE_PITCH_RATE + AT.IGNORE_ROLL_RATE)
         return attitude_pub, msg
 
     elif isinstance(req, srv.SetRatesRequest):
@@ -311,9 +262,25 @@ def handle(req):
         rospy.logwarn('No connection to the FCU')
         return {'message': 'No connection to the FCU'}
 
-    if isinstance(req, srv.NavigateRequest) and req.speed <= 0:
-        rospy.logwarn('Navigate speed must be greater than zero, %s passed')
-        return {'message': 'Navigate speed must be greater than zero, %s passed' % req.speed}
+    if isinstance(req, (srv.NavigateRequest, srv.NavigateGlobalRequest)):
+        if req.speed < 0:
+            rospy.logwarn('Navigate speed must be positive, %s passed')
+            return {'message': 'Navigate speed must be positive, %s passed' % req.speed}
+        elif req.speed == 0:
+            req.speed = DEFAULT_SPEED
+
+    if isinstance(req, (srv.NavigateRequest, srv.NavigateGlobalRequest)) and \
+            (pose is None or rospy.get_rostime() - pose.header.stamp > LOCAL_POSITION_TIMEOUT):
+        rospy.logwarn('No local position')
+        return {'message': 'No local position'}
+
+    if getattr(req, 'yaw_rate', 0) != 0 and not math.isnan(getattr(req, 'yaw')):
+        rospy.logwarn('Yaw value should be NaN for setting yaw rate')
+        return {'message': 'Yaw value should be NaN for setting yaw rate'}
+
+    if math.isnan(getattr(req, 'yaw', 0)) and math.isnan(getattr(req, 'yaw_rate', 0)):
+        rospy.logwarn('Both yaw and yaw_rate cannot be NaN')
+        return {'message': 'Both yaw and yaw_rate cannot be NaN'}
 
     try:
         with handle_lock:
@@ -340,6 +307,25 @@ def handle(req):
         return {'success': False, 'message': str(e)}
 
 
+def land(req):
+    if not state or not state.connected:
+        rospy.logwarn('No connection to the FCU')
+        return {'message': 'No connection to the FCU'}
+
+    rospy.loginfo('Set %s mode', LAND_MODE)
+    res = set_mode(custom_mode=LAND_MODE)
+    if not res.mode_sent:
+        return {'message': 'Cannot send %s mode request' % LAND_MODE}
+
+    start = rospy.get_rostime()
+    while True:
+        if state.mode == LAND_MODE:
+            return {'success': True}
+        if rospy.get_rostime() - start > LAND_TIMEOUT:
+            return {'message': '%s mode request timed out' % LAND_MODE}
+        rospy.sleep(0.1)
+
+
 def release(req):
     global current_pub
     current_pub = None
@@ -348,27 +334,25 @@ def release(req):
 
 
 rospy.Service('navigate', srv.Navigate, handle)
+rospy.Service('navigate_global', srv.NavigateGlobal, handle)
 rospy.Service('set_position', srv.SetPosition, handle)
-rospy.Service('set_position/yaw_rate', srv.SetPositionYawRate, handle)
 rospy.Service('set_position_global', srv.SetPositionGlobal, handle)
-rospy.Service('set_position_global/yaw_rate', srv.SetPositionGlobalYawRate, handle)
 rospy.Service('set_velocity', srv.SetVelocity, handle)
-rospy.Service('set_velocity/yaw_rate', srv.SetVelocityYawRate, handle)
 rospy.Service('set_attitude', srv.SetAttitude, handle)
-rospy.Service('set_attitude/yaw_rate', srv.SetAttitudeYawRate, handle)
 rospy.Service('set_rates', srv.SetRates, handle)
-rospy.Service('set_rates/yaw', srv.SetRatesYaw, handle)
+rospy.Service('land', Trigger, land)
 rospy.Service('release', Trigger, release)
 
 
 def get_telemetry(req):
     res = {
-        'frame_id': req.frame_id or 'local_origin',
+        'frame_id': req.frame_id or LOCAL_FRAME,
         'x': float('nan'),
         'y': float('nan'),
         'z': float('nan'),
         'lat': float('nan'),
         'lon': float('nan'),
+        'alt': float('nan'),
         'vx': float('nan'),
         'vy': float('nan'),
         'vz': float('nan'),
@@ -381,7 +365,7 @@ def get_telemetry(req):
         'voltage': float('nan'),
         'cell_voltage': float('nan')
     }
-    frame_id = req.frame_id or 'local_origin'
+    frame_id = req.frame_id or LOCAL_FRAME
     stamp = rospy.get_rostime()
 
     if pose:
@@ -389,11 +373,9 @@ def get_telemetry(req):
         res['x'] = p.pose.position.x
         res['y'] = p.pose.position.y
         res['z'] = p.pose.position.z
-        # Get yaw in the request's frame_in
-        _, _, res['yaw'] = euler_from_orientation(p.pose.orientation)
-        # Calculate pitch and roll as angles between the pose and fcu_horiz
-        attitude_pose = tf_buffer.transform(pose, 'fcu_horiz', TRANSFORM_TIMEOUT)
-        res['roll'], res['pitch'], _ = euler_from_orientation(attitude_pose.pose.orientation)
+
+        # Calculate roll pitch and yaw as Tait-Bryan angles, order z-y-x
+        res['yaw'], res['pitch'], res['roll'] = euler_from_orientation(p.pose.orientation, axes='rzyx')
 
     if velocity:
         v = Vector3Stamped()
@@ -404,11 +386,15 @@ def get_telemetry(req):
         res['vx'] = linear.vector.x
         res['vy'] = linear.vector.y
         res['vz'] = linear.vector.z
-        # TODO pitch_rate, roll_rate, yaw_rate
+
+        res['yaw_rate'] = velocity.twist.angular.z
+        res['pitch_rate'] = velocity.twist.angular.y
+        res['roll_rate'] = velocity.twist.angular.x
 
     if global_position and stamp - global_position.header.stamp < rospy.Duration(5):
         res['lat'] = global_position.latitude
         res['lon'] = global_position.longitude
+        res['alt'] = global_position.altitude
 
     if state:
         res['connected'] = state.connected
@@ -441,7 +427,8 @@ def start_loop():
                 try:
                     stamp = rospy.get_rostime()
 
-                    if getattr(current_req, 'update_frame', False) or isinstance(current_req, srv.NavigateRequest):
+                    if getattr(current_req, 'update_frame', False) or \
+                            isinstance(current_req, (srv.NavigateRequest, srv.NavigateGlobalRequest)):
                         current_pub, current_msg = get_publisher_and_message(current_req, stamp, True,
                                                                              getattr(current_req, 'update_frame', False))
 
@@ -451,7 +438,7 @@ def start_loop():
                     # For monitoring
                     if isinstance(current_msg, PositionTarget):
                         p = PoseStamped()
-                        p.header.frame_id = 'local_origin'
+                        p.header.frame_id = LOCAL_FRAME
                         p.header.stamp = stamp
                         p.pose.position = current_msg.position
                         p.pose.orientation = orientation_from_euler(0, 0, current_msg.yaw + math.pi / 2)