Skip to content

Commit 7c0cd21

Browse files
authored
Merge pull request #446 from teckel12/development
Sync with v1.7.5
2 parents dcf43a9 + e534060 commit 7c0cd21

25 files changed

+43
-851
lines changed

.github/ISSUE_TEMPLATE/Attempt_to_call_a_nil_value.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: "\U0001F4A5 Attempt to call a nil value"
33
about: Are you getting the message "Attempt to call a nil value"?
44
title: ''
55
labels: support
6+
assignees: teckel12
67
---
78

89
If you're getting an `Attempt to call a nil value` error, it either means you don't have the `luac` build option checked for your OpenTX/JumperTX firmware or you're out of memory on your transmitter. The Taranis series has very little free memory to work with for Lua scripts, so this error is quite common. There's a few things that typically cause this error which are listed below:
@@ -25,4 +26,4 @@ https://github.com/iNavFlight/LuaTelemetry/wiki/Installation
2526

2627
As this is a common issue that I've tried to cover in the Wiki, I would appreciate if you could let me know how the instructions could be improved to avoid any confusion.
2728

28-
Thanks!
29+
Thanks!

.github/ISSUE_TEMPLATE/Bug_report.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: "\U0001F41B Possible bug"
33
about: Report a possible bug or issue with Lua Telemetry
44
title: ''
55
labels: 'bug?'
6+
assignees: teckel12
67
---
78

89
### Describe the bug

.github/ISSUE_TEMPLATE/Feature_request.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: "\U0001F680 Feature request"
33
about: Suggest an idea for Lua Telemetry
44
title: ''
55
labels: feature request
6+
assignees: teckel12
67
---
78

89
### Is your feature request related to a problem? Please describe

.github/ISSUE_TEMPLATE/Not_enough_memory.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: "\U0001F4A5 Not enough memory error"
33
about: Are you getting a "not enough memory error"?
44
title: ''
55
labels: support
6+
assignees: teckel12
67
---
78

89
If you're getting a `not enough memory error`, it means you're out of memory on your transmitter. The Taranis series has very little free memory to work with for Lua scripts, so this error is quite common. There's a few things that typically cause this error which are listed below:
@@ -21,4 +22,4 @@ https://github.com/iNavFlight/LuaTelemetry/wiki/Installation
2122

2223
As this is a common issue that seems clear by the error message and covered in the Wiki, I would appreciate if you could let me know how the instructions could be improved to avoid any confusion.
2324

24-
Thanks!
25+
Thanks!

.github/ISSUE_TEMPLATE/Question.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: "\U00002753 Question"
33
about: Ask a question about Lua Telemetry
44
title: ''
55
labels: question
6+
assignees: teckel12
67
---
78

89
### Describe your question

.gitignore

Lines changed: 1 addition & 195 deletions
Original file line numberDiff line numberDiff line change
@@ -4,198 +4,4 @@ dist/SCRIPTS/TELEMETRY/iNav/*.lua
44
*.zip
55
desktop.ini
66
dist/THEMES/
7-
obj/
8-
.idea
9-
10-
### Lua ###
11-
# Compiled Lua sources
12-
luac.out
13-
14-
# luarocks build files
15-
*.src.rock
16-
*.tar.gz
17-
18-
# Object files
19-
*.o
20-
*.os
21-
*.ko
22-
*.obj
23-
*.elf
24-
25-
# Precompiled Headers
26-
*.gch
27-
*.pch
28-
29-
# Libraries
30-
*.lib
31-
*.a
32-
*.la
33-
*.lo
34-
*.def
35-
*.exp
36-
37-
# Shared objects (inc. Windows DLLs)
38-
*.dll
39-
*.so
40-
*.so.*
41-
*.dylib
42-
43-
# Executables
44-
*.exe
45-
*.out
46-
*.app
47-
*.i*86
48-
*.x86_64
49-
*.hex
50-
51-
52-
### Python ###
53-
# Byte-compiled / optimized / DLL files
54-
__pycache__/
55-
*.py[cod]
56-
*$py.class
57-
58-
# C extensions
59-
60-
# Distribution / packaging
61-
.Python
62-
build/
63-
develop-eggs/
64-
dist/
65-
downloads/
66-
eggs/
67-
.eggs/
68-
lib/
69-
lib64/
70-
parts/
71-
sdist/
72-
var/
73-
wheels/
74-
pip-wheel-metadata/
75-
share/python-wheels/
76-
*.egg-info/
77-
.installed.cfg
78-
*.egg
79-
MANIFEST
80-
81-
# PyInstaller
82-
# Usually these files are written by a python script from a template
83-
# before PyInstaller builds the exe, so as to inject date/other infos into it.
84-
*.manifest
85-
*.spec
86-
87-
# Installer logs
88-
pip-log.txt
89-
pip-delete-this-directory.txt
90-
91-
# Unit test / coverage reports
92-
htmlcov/
93-
.tox/
94-
.nox/
95-
.coverage
96-
.coverage.*
97-
.cache
98-
nosetests.xml
99-
coverage.xml
100-
*.cover
101-
*.py,cover
102-
.hypothesis/
103-
.pytest_cache/
104-
pytestdebug.log
105-
106-
# Translations
107-
*.mo
108-
*.pot
109-
110-
# Django stuff:
111-
*.log
112-
local_settings.py
113-
db.sqlite3
114-
db.sqlite3-journal
115-
116-
# Flask stuff:
117-
instance/
118-
.webassets-cache
119-
120-
# Scrapy stuff:
121-
.scrapy
122-
123-
# Sphinx documentation
124-
docs/_build/
125-
doc/_build/
126-
127-
# PyBuilder
128-
target/
129-
130-
# Jupyter Notebook
131-
.ipynb_checkpoints
132-
133-
# IPython
134-
profile_default/
135-
ipython_config.py
136-
137-
# pyenv
138-
.python-version
139-
140-
# pipenv
141-
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
142-
# However, in case of collaboration, if having platform-specific dependencies or dependencies
143-
# having no cross-platform support, pipenv may install dependencies that don't work, or not
144-
# install all needed dependencies.
145-
#Pipfile.lock
146-
147-
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
148-
__pypackages__/
149-
150-
# Celery stuff
151-
celerybeat-schedule
152-
celerybeat.pid
153-
154-
# SageMath parsed files
155-
*.sage.py
156-
157-
# Environments
158-
.env
159-
.venv
160-
env/
161-
venv/
162-
ENV/
163-
env.bak/
164-
venv.bak/
165-
pythonenv*
166-
167-
# Spyder project settings
168-
.spyderproject
169-
.spyproject
170-
171-
# Rope project settings
172-
.ropeproject
173-
174-
# mkdocs documentation
175-
/site
176-
177-
# mypy
178-
.mypy_cache/
179-
.dmypy.json
180-
dmypy.json
181-
182-
# Pyre type checker
183-
.pyre/
184-
185-
# pytype static type analyzer
186-
.pytype/
187-
188-
# profiling data
189-
.prof
190-
191-
### VirtualEnv ###
192-
# Virtualenv
193-
# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
194-
[Bb]in
195-
[Ii]nclude
196-
[Ll]ib
197-
[Ll]ib64
198-
[Ll]ocal
199-
[Ss]cripts
200-
pyvenv.cfg
201-
pip-selfcheck.json
7+
obj/

.travis.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@ os: linux
22

33
dist: trusty
44

5-
sudo: false
6-
75
language: c
86

7+
branches:
8+
except:
9+
- master
10+
911
env:
1012
global:
1113
- LUAROCKS=2.3.0
12-
matrix:
14+
jobs:
1315
- LUA=lua5.2
1416

1517
before_install:
@@ -30,12 +32,12 @@ script:
3032
after_success:
3133
- coveralls -b .. -r .. -i ./src --dump c.report.json
3234
- luacov-coveralls -j c.report.json -v
33-
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then curl -X POST https://api.telegram.org/bot797688679:AAEcKXFJ-0cDfiQLmn_hMg83FDFEtV7x2LQ/sendMessage -d chat_id=@luatelemetry -d "text=Build successful - PR #$TRAVIS_PULL_REQUEST $TRAVIS_PULL_REQUEST_BRANCH > $TRAVIS_BRANCH"; fi'
34-
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then curl -X POST https://api.telegram.org/bot797688679:AAEcKXFJ-0cDfiQLmn_hMg83FDFEtV7x2LQ/sendMessage -d chat_id=@luatelemetry -d "text=Build successful - Branch $TRAVIS_BRANCH: $TRAVIS_COMMIT_MESSAGE"; fi'
35+
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then curl -X POST "https://api.telegram.org/bot$TELEGRAM_TOKEN/sendMessage" -d chat_id=@luatelemetry -d "text=Build successful - PR #$TRAVIS_PULL_REQUEST $TRAVIS_PULL_REQUEST_BRANCH > $TRAVIS_BRANCH"; fi'
36+
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then curl -X POST "https://api.telegram.org/bot$TELEGRAM_TOKEN/sendMessage" -d chat_id=@luatelemetry -d "text=Build successful - Branch $TRAVIS_BRANCH: $TRAVIS_COMMIT_MESSAGE"; fi'
3537

3638
notifications:
3739
email:
3840
recipients:
39-
41+
- "$EMAIL_NOTIFICATION"
4042
on_success: never
4143
on_failure: always

README.md

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
## INAV Lua Telemetry Flight Status for Taranis/Horus/Jumper/Nirvana - v1.7.4
1+
## INAV Lua Telemetry Flight Status for Taranis/Horus/Jumper/Nirvana - v1.7.5
22

3-
### FrSky SmartPort(S.Port), D-series, F.Port & TBS Crossfire telemetry on Taranis, Horus, Jumper & Nirvana transmitters
3+
> The new official repo for Lua Telemetry by the original (and only) author:
4+
>
5+
> **https://github.com/teckel12/LuaTelemetry**
46
5-
[![Build Status](https://travis-ci.com/iNavFlight/LuaTelemetry.svg?branch=master)](https://travis-ci.com/iNavFlight/LuaTelemetry)
7+
### FrSky SmartPort(S.Port), D-series, F.Port & TBS Crossfire telemetry on Taranis, Horus, Jumper & Nirvana transmitters
68

7-
- **New documentation:** https://luatelemetry.readthedocs.io/en/latest/
9+
[![Build Status](https://travis-ci.com/teckel12/LuaTelemetry.svg?branch=master)](https://travis-ci.com/teckel12/LuaTelemetry)
810

911
## Interface
1012

@@ -39,7 +41,7 @@
3941

4042
* Supported receivers: All FrSky telemetry receivers (X, R9 and D series) and all TBS Crossfire receivers
4143
* Supported transmitters: All FrSky Taranis and Horus transmitters, Jumper T12 & T16 and the FLYSKY Nirvana NV14
42-
* Compatible with Betaflight using FrSky X or R9 series receivers (with reduced functionality) and TBS Crossfire support with Betaflight v4.0.0+
44+
* Compatible with Betaflight using FrSky X or R9 series receivers (with reduced functionality) and TBS Crossfire support
4345
* Launch/pilot-based model orientation and location indicators (great for lost orientation/losing sight of your model)
4446
* Compass-based direction indicator (with magnetometer sensor on multirotor or fixed-wing with GPS)
4547
* Pilot (glass cockpit) view which includes attitude indicator as well as pilot-familiar layout of additional data
@@ -81,34 +83,34 @@
8183
## Special Thanks
8284

8385
* [Team Black Sheep](https://www.team-blacksheep.com/) - Sponsoring TBS Crossfire telemetry support
84-
* [FrSky](https://www.frsky-rc.com/) - Sponsoring [FrSky Horus](https://us.banggood.com/custlink/vG3D6Kiprr) transmitter support
86+
* [FrSky](https://www.frsky-rc.com/) - Sponsoring FrSky Horus transmitter support
8587
* [Jumper](https://www.jumper.xyz/) - Sponsoring Jumper T16 transmitter support
86-
* [FLYSKY](https://www.flysky-cn.com/) - Sponsoring [FLYSKY Nirvana NV14](https://us.banggood.com/custlink/GmGm0GZcpt) transmitter support
88+
* [FLYSKY](https://www.flysky-cn.com/) - Sponsoring FLYSKY Nirvana NV14 transmitter support
8789

8890
## Setup
8991

90-
* [Lua Telemetry Wiki](https://github.com/iNavFlight/LuaTelemetry/wiki)
91-
* [Download latest release](https://github.com/iNavFlight/LuaTelemetry/releases/latest)
92-
* [Installation Instructions](https://github.com/iNavFlight/LuaTelemetry/wiki/Installation)
93-
* [Upgrade Instructions](https://github.com/iNavFlight/LuaTelemetry/wiki/Upgrade)
94-
* [Download Options](https://github.com/iNavFlight/LuaTelemetry/wiki/Download-Options)
92+
* [Lua Telemetry Wiki](https://github.com/teckel12/LuaTelemetry/wiki)
93+
* [Download latest release](https://github.com/teckel12/LuaTelemetry/releases/latest)
94+
* [Installation Instructions](https://github.com/teckel12/LuaTelemetry/wiki/Installation)
95+
* [Upgrade Instructions](https://github.com/teckel12/LuaTelemetry/wiki/Upgrade)
96+
* [Download Options](https://github.com/teckel12/LuaTelemetry/wiki/Download-Options)
9597

9698
## Information & Settings
9799

98-
* [Screen Description](https://github.com/iNavFlight/LuaTelemetry/wiki/Screen-Description)
99-
* [Configuration Settings](https://github.com/iNavFlight/LuaTelemetry/wiki/Configuration-Settings)
100-
* [Suggested Battery Settings](https://github.com/iNavFlight/LuaTelemetry/wiki/Suggested-Battery-Settings)
101-
* [Playback Telemetry Logs](https://github.com/iNavFlight/LuaTelemetry/wiki/Playback-Telemetry-Log-Files)
100+
* [Screen Description](https://github.com/teckel12/LuaTelemetry/wiki/Screen-Description)
101+
* [Configuration Settings](https://github.com/teckel12/LuaTelemetry/wiki/Configuration-Settings)
102+
* [Suggested Battery Settings](https://github.com/teckel12/LuaTelemetry/wiki/Suggested-Battery-Settings)
103+
* [Playback Telemetry Logs](https://github.com/teckel12/LuaTelemetry/wiki/Playback-Telemetry-Log-Files)
102104

103105
## Support
104106

105-
* [Tips & Common Problems](https://github.com/iNavFlight/LuaTelemetry/wiki/Tips-&-Common-Problems)
106-
* [Support Issues](https://github.com/iNavFlight/LuaTelemetry/issues?q=is%3Aissue)
107+
* [Tips & Common Problems](https://github.com/teckel12/LuaTelemetry/wiki/Tips-&-Common-Problems)
108+
* [Support Issues](https://github.com/teckel12/LuaTelemetry/issues?q=is%3Aissue)
107109
* [Support Chat (Telegram)](https://t.me/luatelemetry)
108110

109111
## Other
110112

111-
* [Upgrade to Development Build](https://github.com/iNavFlight/LuaTelemetry/wiki/Upgrade-to-Development-Build)
112-
* [Release History](https://github.com/iNavFlight/LuaTelemetry/wiki/Change-Log)
113-
* [Multilingual Support](https://github.com/iNavFlight/LuaTelemetry/wiki/Multilingual-Support)
114-
* [License](https://github.com/iNavFlight/LuaTelemetry/blob/master/LICENSE)
113+
* [Upgrade to Development Build](https://github.com/teckel12/LuaTelemetry/wiki/Upgrade-to-Development-Build)
114+
* [Release History](https://github.com/teckel12/LuaTelemetry/wiki/Change-Log)
115+
* [Multilingual Support](https://github.com/teckel12/LuaTelemetry/wiki/Multilingual-Support)
116+
* [License](https://github.com/teckel12/LuaTelemetry/blob/master/LICENSE)

dist/SCRIPTS/TELEMETRY/iNav.lua

0 Bytes
Binary file not shown.

dist/SCRIPTS/TELEMETRY/iNav.luac

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)