Skip to content

Commit

Permalink
Merge pull request #446 from teckel12/development
Browse files Browse the repository at this point in the history
Sync with v1.7.5
  • Loading branch information
teckel12 authored Feb 28, 2021
2 parents dcf43a9 + e534060 commit 7c0cd21
Show file tree
Hide file tree
Showing 25 changed files with 43 additions and 851 deletions.
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/Attempt_to_call_a_nil_value.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: "\U0001F4A5 Attempt to call a nil value"
about: Are you getting the message "Attempt to call a nil value"?
title: ''
labels: support
assignees: teckel12
---

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:
Expand All @@ -25,4 +26,4 @@ https://github.com/iNavFlight/LuaTelemetry/wiki/Installation

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.

Thanks!
Thanks!
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/Bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: "\U0001F41B Possible bug"
about: Report a possible bug or issue with Lua Telemetry
title: ''
labels: 'bug?'
assignees: teckel12
---

### Describe the bug
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/Feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: "\U0001F680 Feature request"
about: Suggest an idea for Lua Telemetry
title: ''
labels: feature request
assignees: teckel12
---

### Is your feature request related to a problem? Please describe
Expand Down
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/Not_enough_memory.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: "\U0001F4A5 Not enough memory error"
about: Are you getting a "not enough memory error"?
title: ''
labels: support
assignees: teckel12
---

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:
Expand All @@ -21,4 +22,4 @@ https://github.com/iNavFlight/LuaTelemetry/wiki/Installation

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.

Thanks!
Thanks!
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/Question.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: "\U00002753 Question"
about: Ask a question about Lua Telemetry
title: ''
labels: question
assignees: teckel12
---

### Describe your question
Expand Down
196 changes: 1 addition & 195 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,198 +4,4 @@ dist/SCRIPTS/TELEMETRY/iNav/*.lua
*.zip
desktop.ini
dist/THEMES/
obj/
.idea

### Lua ###
# Compiled Lua sources
luac.out

# luarocks build files
*.src.rock
*.tar.gz

# Object files
*.o
*.os
*.ko
*.obj
*.elf

# Precompiled Headers
*.gch
*.pch

# Libraries
*.lib
*.a
*.la
*.lo
*.def
*.exp

# Shared objects (inc. Windows DLLs)
*.dll
*.so
*.so.*
*.dylib

# Executables
*.exe
*.out
*.app
*.i*86
*.x86_64
*.hex


### Python ###
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
pytestdebug.log

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/
doc/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/
pythonenv*

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# profiling data
.prof

### VirtualEnv ###
# Virtualenv
# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
[Bb]in
[Ii]nclude
[Ll]ib
[Ll]ib64
[Ll]ocal
[Ss]cripts
pyvenv.cfg
pip-selfcheck.json
obj/
14 changes: 8 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@ os: linux

dist: trusty

sudo: false

language: c

branches:
except:
- master

env:
global:
- LUAROCKS=2.3.0
matrix:
jobs:
- LUA=lua5.2

before_install:
Expand All @@ -30,12 +32,12 @@ script:
after_success:
- coveralls -b .. -r .. -i ./src --dump c.report.json
- luacov-coveralls -j c.report.json -v
- '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'
- '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'
- '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'
- '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'

notifications:
email:
recipients:
- eckel.tim@gmail.com
- "$EMAIL_NOTIFICATION"
on_success: never
on_failure: always
46 changes: 24 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
## INAV Lua Telemetry Flight Status for Taranis/Horus/Jumper/Nirvana - v1.7.4
## INAV Lua Telemetry Flight Status for Taranis/Horus/Jumper/Nirvana - v1.7.5

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

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

## Interface

Expand Down Expand Up @@ -39,7 +41,7 @@

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

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

## Setup

* [Lua Telemetry Wiki](https://github.com/iNavFlight/LuaTelemetry/wiki)
* [Download latest release](https://github.com/iNavFlight/LuaTelemetry/releases/latest)
* [Installation Instructions](https://github.com/iNavFlight/LuaTelemetry/wiki/Installation)
* [Upgrade Instructions](https://github.com/iNavFlight/LuaTelemetry/wiki/Upgrade)
* [Download Options](https://github.com/iNavFlight/LuaTelemetry/wiki/Download-Options)
* [Lua Telemetry Wiki](https://github.com/teckel12/LuaTelemetry/wiki)
* [Download latest release](https://github.com/teckel12/LuaTelemetry/releases/latest)
* [Installation Instructions](https://github.com/teckel12/LuaTelemetry/wiki/Installation)
* [Upgrade Instructions](https://github.com/teckel12/LuaTelemetry/wiki/Upgrade)
* [Download Options](https://github.com/teckel12/LuaTelemetry/wiki/Download-Options)

## Information & Settings

* [Screen Description](https://github.com/iNavFlight/LuaTelemetry/wiki/Screen-Description)
* [Configuration Settings](https://github.com/iNavFlight/LuaTelemetry/wiki/Configuration-Settings)
* [Suggested Battery Settings](https://github.com/iNavFlight/LuaTelemetry/wiki/Suggested-Battery-Settings)
* [Playback Telemetry Logs](https://github.com/iNavFlight/LuaTelemetry/wiki/Playback-Telemetry-Log-Files)
* [Screen Description](https://github.com/teckel12/LuaTelemetry/wiki/Screen-Description)
* [Configuration Settings](https://github.com/teckel12/LuaTelemetry/wiki/Configuration-Settings)
* [Suggested Battery Settings](https://github.com/teckel12/LuaTelemetry/wiki/Suggested-Battery-Settings)
* [Playback Telemetry Logs](https://github.com/teckel12/LuaTelemetry/wiki/Playback-Telemetry-Log-Files)

## Support

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

## Other

* [Upgrade to Development Build](https://github.com/iNavFlight/LuaTelemetry/wiki/Upgrade-to-Development-Build)
* [Release History](https://github.com/iNavFlight/LuaTelemetry/wiki/Change-Log)
* [Multilingual Support](https://github.com/iNavFlight/LuaTelemetry/wiki/Multilingual-Support)
* [License](https://github.com/iNavFlight/LuaTelemetry/blob/master/LICENSE)
* [Upgrade to Development Build](https://github.com/teckel12/LuaTelemetry/wiki/Upgrade-to-Development-Build)
* [Release History](https://github.com/teckel12/LuaTelemetry/wiki/Change-Log)
* [Multilingual Support](https://github.com/teckel12/LuaTelemetry/wiki/Multilingual-Support)
* [License](https://github.com/teckel12/LuaTelemetry/blob/master/LICENSE)
Binary file modified dist/SCRIPTS/TELEMETRY/iNav.lua
Binary file not shown.
Binary file modified dist/SCRIPTS/TELEMETRY/iNav.luac
Binary file not shown.
Binary file modified dist/SCRIPTS/TELEMETRY/iNav/crsf.luac
Binary file not shown.
Loading

0 comments on commit 7c0cd21

Please sign in to comment.