From 295b9c98d10c3f0ee87e87cbf1f27848c0b69533 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Sat, 12 May 2018 16:58:54 +0300 Subject: [PATCH 1/4] docs: rework images article --- docs/microsd_images.md | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/docs/microsd_images.md b/docs/microsd_images.md index eaec420d..398835ef 100644 --- a/docs/microsd_images.md +++ b/docs/microsd_images.md @@ -1,21 +1,18 @@ # Образ для Raspberry Pi -## Установка образа операционной системы на MicroSD карту - -Для установки образа воспользуйтесь утилитой [Etcher](https://etcher.io): - -[![Etcher](https://etcher.io/static/screenshot.gif) -](https://etcher.io) - -## Образы +## Образ На образе установлены: * Raspbian Stretch * ROS Kinetic -* [Пакет ПО для Клевера](https://github.com/CopterExpress/clever_bundle) +* [Пакет ПО для Клевера](https://github.com/CopterExpress/clever) -|Версия|Дата|Ссылка|Примечания| -|-|-|-|-| -|0.2|24.01.18|[Скачать](https://yadi.sk/d/n_Krnor03RkntU)|–| -|0.1|15.12.17|[Скачать](https://drive.google.com/open?id=1Gtj_0iB7dFuorfUKAUUV8ImjmkZCkvc7)|–| +**Свежую версию образа можно [скачать на GitHub в разделе Releases](https://github.com/CopterExpress/clever/releases).** + +## Установка образа ОС на MicroSD-карту + +Для установки образа воспользуйтесь утилитой [Etcher](https://etcher.io): + +[![Etcher](https://etcher.io/static/screenshot.gif) +](https://etcher.io) From 9ed9af2d04236b903cbec33aab6bb966a7992a13 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Sat, 12 May 2018 17:02:48 +0300 Subject: [PATCH 2/4] Some fixes to readme --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ee13fd68..9c93e396 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,13 @@ CLEVER is an educational programmable drone kit consisting of an unassembled qua 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 [Robokross-2016](https://www.youtube.com/watch?v=dGbDaz_VmYU) and [Robokross-2017](https://youtu.be/AQnd2CRczbQ) competitions and many others. -**The main documentation in Russian is available on our Gitbook:** -**https://copterexpress.gitbooks.io/clever/content/** +**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 -Preconfigured image for Raspberry Pi 3 with installed and configured software, ready to fly, is available [here](https://copterexpress.gitbooks.io/clever/content/docs/microsd_images.html). +**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).** Image includes: @@ -24,7 +23,7 @@ Image includes: * mavros * CLEVER software bundle for autonomous drone control -API description in Russian for autonomous flights is available [here](https://copterexpress.gitbooks.io/clever/simple_offboard.html). +API description (in Russian) for autonomous flights is available [on GitBook](https://copterexpress.gitbooks.io/clever/simple_offboard.html). ## Manual installation From c57a342053a454f19a80d01cfab6a15fab5d38ff Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Sat, 12 May 2018 17:03:25 +0300 Subject: [PATCH 3/4] Fix to readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c93e396..84a55e43 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ 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. -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 [Robokross-2016](https://www.youtube.com/watch?v=dGbDaz_VmYU) and [Robokross-2017](https://youtu.be/AQnd2CRczbQ) competitions and many others. +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. **The main documentation in Russian is available [on our Gitbook](https://clever.copterexpress.com/).** From d4e783c96fb4f6660adbfd71c0385f93110c4b10 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Sun, 13 May 2018 20:10:41 +0300 Subject: [PATCH 4/4] snippets: get_distance_global --- docs/snippets.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/snippets.md b/docs/snippets.md index 2cff01f0..53bd4690 100644 --- a/docs/snippets.md +++ b/docs/snippets.md @@ -20,6 +20,15 @@ def get_distance(x1, y1, z1, x2, y2, z2): --- +Функция для приблизительного определения расстояния (в метрах) между двумя глобальными координатами (широта/долгота): + +```python +def get_distance_global(lat1, lon1, lat2, lon2): + return math.hypot(lat1 - lat2, lon1 - lon2) * 1.113195e5 +``` + +--- + Взлет и ожидание окончания взлета: ```python