Compare commits
No commits in common. "v9.1.0" and "master" have entirely different histories.
17
.gitattributes
vendored
17
.gitattributes
vendored
@ -1,17 +0,0 @@
|
|||||||
# Auto detect text files and perform LF normalization
|
|
||||||
* text=off
|
|
||||||
|
|
||||||
# Custom for Visual Studio
|
|
||||||
*.cs diff=csharp
|
|
||||||
|
|
||||||
# Standard to msysgit
|
|
||||||
*.doc diff=astextplain
|
|
||||||
*.DOC diff=astextplain
|
|
||||||
*.docx diff=astextplain
|
|
||||||
*.DOCX diff=astextplain
|
|
||||||
*.dot diff=astextplain
|
|
||||||
*.DOT diff=astextplain
|
|
||||||
*.pdf diff=astextplain
|
|
||||||
*.PDF diff=astextplain
|
|
||||||
*.rtf diff=astextplain
|
|
||||||
*.RTF diff=astextplain
|
|
||||||
83
.github/ISSUE_TEMPLATE/Bug_report.md
vendored
83
.github/ISSUE_TEMPLATE/Bug_report.md
vendored
@ -1,83 +0,0 @@
|
|||||||
---
|
|
||||||
name: Problem report
|
|
||||||
about: Create a report to help us improve
|
|
||||||
---
|
|
||||||
|
|
||||||
<!-- Thanks for reporting a problem for this project. READ THIS FIRST:
|
|
||||||
|
|
||||||
This issue template is meant to REPORT Tasmota software PROBLEMS ONLY
|
|
||||||
|
|
||||||
Please DO NOT OPEN AN ISSUE:
|
|
||||||
- If your Tasmota version is not the latest from the development branch, please update your device before submitting your issue. Your problem might already be solved. The latest precompiled binaries of Tasmota can be downloaded from http://ota.tasmota.com/tasmota/
|
|
||||||
- If you have an issue when flashing was done via Tuya Convert, please address it to Tuya Convert Team
|
|
||||||
- If your issue is a flashing issue, please address it to the [Tasmota Support Chat](https://discord.gg/Ks2Kzd4)
|
|
||||||
- If your issue is compilation problem, please address it to the [Tasmota Support Chat](https://discord.gg/Ks2Kzd4)
|
|
||||||
- If your issue has been addressed before (i.e., duplicated issue), please ask in the original issue
|
|
||||||
- If your issue is a Wi-Fi problem or MQTT problem, please try the steps provided in the [FAQ](https://tasmota.github.io/docs/FAQ) and [Troubleshooting](https://tasmota.github.io/docs/Troubleshooting)
|
|
||||||
|
|
||||||
Please take a few minutes to complete the requested information below. Our ability to provide assistance is greatly hampered without it. The details requested potentially affect which options to pursue. The small amount of time you spend completing the template will also help the volunteers providing the assistance to you to reduce the time required to help you.
|
|
||||||
|
|
||||||
DO NOT DELETE ANY TEXT from this template! Otherwise the issue will be auto-closed.
|
|
||||||
-->
|
|
||||||
|
|
||||||
### PROBLEM DESCRIPTION
|
|
||||||
_A clear and concise description of what the problem is._
|
|
||||||
|
|
||||||
|
|
||||||
### REQUESTED INFORMATION
|
|
||||||
_Make sure your have performed every step and checked the applicable boxes before submitting your issue. Thank you!_
|
|
||||||
|
|
||||||
- [ ] Read the [Contributing Guide and Policy](https://github.com/arendst/Tasmota/blob/development/CONTRIBUTING.md) and [the Code of Conduct](https://github.com/arendst/Tasmota/blob/development/CODE_OF_CONDUCT.md)
|
|
||||||
- [ ] Searched the problem in [issues](https://github.com/arendst/Tasmota/issues)
|
|
||||||
- [ ] Searched the problem in the [docs](https://tasmota.github.io/docs/FAQ)
|
|
||||||
- [ ] Searched the problem in the [forum](https://groups.google.com/d/forum/sonoffusers)
|
|
||||||
- [ ] Searched the problem in the [chat](https://discord.gg/Ks2Kzd4)
|
|
||||||
- [ ] Device used (e.g., Sonoff Basic): _____
|
|
||||||
- [ ] Tasmota binary firmware version number used: _____
|
|
||||||
- [ ] Pre-compiled
|
|
||||||
- [ ] Self-compiled
|
|
||||||
- [ ] IDE / Compiler used: _____
|
|
||||||
- [ ] Flashing tools used: _____
|
|
||||||
- [ ] Provide the output of command: `Backlog Template; Module; GPIO 255`:
|
|
||||||
```
|
|
||||||
Configuration output here:
|
|
||||||
|
|
||||||
|
|
||||||
```
|
|
||||||
- [ ] If using rules, provide the output of this command: `Backlog Rule1; Rule2; Rule3`:
|
|
||||||
```
|
|
||||||
Rules output here:
|
|
||||||
|
|
||||||
|
|
||||||
```
|
|
||||||
- [ ] Provide the output of this command: `Status 0`:
|
|
||||||
```
|
|
||||||
STATUS 0 output here:
|
|
||||||
|
|
||||||
|
|
||||||
```
|
|
||||||
- [ ] Provide the output of the Console log output when you experience your issue; if applicable:
|
|
||||||
_(Please use_ `weblog 4` _for more debug information)_
|
|
||||||
```
|
|
||||||
Console output here:
|
|
||||||
|
|
||||||
|
|
||||||
```
|
|
||||||
|
|
||||||
### TO REPRODUCE
|
|
||||||
_Steps to reproduce the behavior:_
|
|
||||||
|
|
||||||
|
|
||||||
### EXPECTED BEHAVIOUR
|
|
||||||
_A clear and concise description of what you expected to happen._
|
|
||||||
|
|
||||||
|
|
||||||
### SCREENSHOTS
|
|
||||||
_If applicable, add screenshots to help explain your problem._
|
|
||||||
|
|
||||||
|
|
||||||
### ADDITIONAL CONTEXT
|
|
||||||
_Add any other context about the problem here._
|
|
||||||
|
|
||||||
|
|
||||||
**(Please, remember to close the issue when the problem has been addressed)**
|
|
||||||
27
.github/ISSUE_TEMPLATE/Feature_request.md
vendored
27
.github/ISSUE_TEMPLATE/Feature_request.md
vendored
@ -1,27 +0,0 @@
|
|||||||
---
|
|
||||||
name: Feature request
|
|
||||||
about: Suggest an idea for this project
|
|
||||||
---
|
|
||||||
|
|
||||||
<!-- Thanks for suggesting an idea for this project. READ THIS FIRST:
|
|
||||||
|
|
||||||
Please take a few minutes to complete the requested information below. Our ability to provide assistance is greatly hampered without it. The details requested potentially affect which options to pursue. The small amount of time you spend completing the template will also help the volunteers providing the assistance to you to reduce the time required to help you.
|
|
||||||
|
|
||||||
DO NOT DELETE ANY TEXT from this template! Otherwise the issue will be auto-closed.
|
|
||||||
-->
|
|
||||||
|
|
||||||
**Have you looked for this feature in other issues and in the docs?**
|
|
||||||
|
|
||||||
**Is your feature request related to a problem? Please describe.**
|
|
||||||
_A clear and concise description of what the problem is._
|
|
||||||
|
|
||||||
**Describe the solution you'd like**
|
|
||||||
_A clear and concise description of what you want to happen._
|
|
||||||
|
|
||||||
**Describe alternatives you've considered**
|
|
||||||
_A clear and concise description of any alternative solutions or features you've considered._
|
|
||||||
|
|
||||||
**Additional context**
|
|
||||||
_Add any other context or screenshots about the feature request here._
|
|
||||||
|
|
||||||
**(Please, remember to close the issue when the problem has been addressed)**
|
|
||||||
8
.github/ISSUE_TEMPLATE/config.yml
vendored
8
.github/ISSUE_TEMPLATE/config.yml
vendored
@ -1,8 +0,0 @@
|
|||||||
blank_issues_enabled: false
|
|
||||||
contact_links:
|
|
||||||
- name: Tasmota Docs
|
|
||||||
url: https://tasmota.github.io/docs
|
|
||||||
about: All the information related to Tasmota
|
|
||||||
- name: Tasmota Support Chat
|
|
||||||
url: https://discord.gg/Ks2Kzd4
|
|
||||||
about: Chat for feedback, questions and troubleshooting.
|
|
||||||
13
.github/PULL_REQUEST_TEMPLATE.md
vendored
13
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -1,13 +0,0 @@
|
|||||||
## Description:
|
|
||||||
|
|
||||||
**Related issue (if applicable):** fixes #<Tasmota issue number goes here>
|
|
||||||
|
|
||||||
## Checklist:
|
|
||||||
- [ ] The pull request is done against the latest dev branch
|
|
||||||
- [ ] Only relevant files were touched
|
|
||||||
- [ ] Only one feature/fix was added per PR.
|
|
||||||
- [ ] The code change is tested and works on Tasmota core ESP8266 V.2.7.4.5
|
|
||||||
- [ ] The code change is tested and works on core ESP32 V.1.12.2
|
|
||||||
- [ ] I accept the [CLA](https://github.com/arendst/Tasmota/blob/development/CONTRIBUTING.md#contributor-license-agreement-cla).
|
|
||||||
|
|
||||||
_NOTE: The code change must pass CI tests. **Your PR cannot be merged unless tests pass**_
|
|
||||||
11
.github/config.yml
vendored
11
.github/config.yml
vendored
@ -1,11 +0,0 @@
|
|||||||
# Configuration for sentiment-bot - https://github.com/behaviorbot/sentiment-bot
|
|
||||||
|
|
||||||
# *Required* toxicity threshold between 0 and .99 with the higher numbers being the most toxic
|
|
||||||
# Anything higher than this threshold will be marked as toxic and commented on
|
|
||||||
sentimentBotToxicityThreshold: .7
|
|
||||||
|
|
||||||
# *Required* Comment to reply with
|
|
||||||
sentimentBotReplyComment: >
|
|
||||||
Please be sure to review the code of conduct and be respectful of other users.
|
|
||||||
|
|
||||||
# Note: the bot will only work if your repository has a Code of Conduct
|
|
||||||
52
.github/issue-close-app.yml
vendored
52
.github/issue-close-app.yml
vendored
@ -1,52 +0,0 @@
|
|||||||
# CLOSE ISSUE BOT
|
|
||||||
# ---------------
|
|
||||||
# A bot which helps you to close issues that don't include some specific contents.
|
|
||||||
# See how to use it in https://github.com/offu/close-issue-app.
|
|
||||||
|
|
||||||
# Comment that will be sent if an issue is judged to be closed.
|
|
||||||
comment: >-
|
|
||||||
This issue has been automatically closed because the issue template is missing or incomplete.
|
|
||||||
|
|
||||||
Filling the template is required so standard questions don't need to be asked again each time.
|
|
||||||
Our ability to provide assistance is greatly hampered if few minutes are not taken to complete the issue template
|
|
||||||
with the requested information. The details requested potentially affect which options to pursue. The small amount
|
|
||||||
of time you will spend completing the template will also help the volunteers, providing assistance to you, to reduce
|
|
||||||
the time required to help you.
|
|
||||||
|
|
||||||
Please, could you be so kind on completing the [issue template](https://github.com/arendst/Tasmota/issues/new/choose) in order to have more information so as to properly help you?
|
|
||||||
|
|
||||||
Thank you for taking the time to report, hopefully it can be resolved soon.
|
|
||||||
|
|
||||||
[Wiki](https://tasmota.github.io/docs/) for more information.
|
|
||||||
|
|
||||||
[Chat](https://discord.gg/Ks2Kzd4) for more user experience.
|
|
||||||
|
|
||||||
[Community](https://groups.google.com/d/forum/sonoffusers) for forum.
|
|
||||||
|
|
||||||
[Code of Conduct](https://github.com/arendst/Tasmota/blob/development/CODE_OF_CONDUCT.md)
|
|
||||||
|
|
||||||
[Contributing Guideline and Policy](https://github.com/arendst/Tasmota/blob/development/CONTRIBUTING.md)
|
|
||||||
|
|
||||||
issueConfigs:
|
|
||||||
# There can be several configs for different kind of issues.
|
|
||||||
- content:
|
|
||||||
# template 1: bug report
|
|
||||||
- "PROBLEM DESCRIPTION"
|
|
||||||
- "REQUESTED INFORMATION"
|
|
||||||
- "TO REPRODUCE"
|
|
||||||
- "EXPECTED BEHAVIOUR"
|
|
||||||
- content:
|
|
||||||
# template 2: feature request
|
|
||||||
- "Have you looked for this feature in other issues and in the docs"
|
|
||||||
- "Describe the solution you'd like"
|
|
||||||
|
|
||||||
# Optional configuration:
|
|
||||||
#
|
|
||||||
# whether the keywords are case-insensitive
|
|
||||||
# default value is false, which means keywords are case-sensitive
|
|
||||||
caseInsensitive: true
|
|
||||||
# the label that will be added when the bot close an issue
|
|
||||||
# The bot will only add a label if this property is set.
|
|
||||||
label: "template missing/incomplete"
|
|
||||||
# The issue is judged to be legal if it includes all keywords from any of these two configs.
|
|
||||||
# Or it will be closed by the app.
|
|
||||||
40
.github/stale.yml
vendored
40
.github/stale.yml
vendored
@ -1,40 +0,0 @@
|
|||||||
# Number of days of inactivity before an Issue or Pull Request becomes stale
|
|
||||||
daysUntilStale: 25
|
|
||||||
|
|
||||||
# Number of days of inactivity before a stale Issue or Pull Request is closed.
|
|
||||||
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
|
|
||||||
daysUntilClose: 5
|
|
||||||
|
|
||||||
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
|
|
||||||
exemptLabels:
|
|
||||||
- pinned
|
|
||||||
- security
|
|
||||||
- enhancement
|
|
||||||
- bug
|
|
||||||
|
|
||||||
# Set to true to ignore issues in a project (defaults to false)
|
|
||||||
exemptProjects: false
|
|
||||||
|
|
||||||
# Set to true to ignore issues in a milestone (defaults to false)
|
|
||||||
exemptMilestones: false
|
|
||||||
|
|
||||||
# Label to use when marking as stale
|
|
||||||
staleLabel: stale
|
|
||||||
|
|
||||||
# Comment to post when marking as stale. Set to `false` to disable
|
|
||||||
markComment: >
|
|
||||||
This issue has been automatically marked as stale because it has not had
|
|
||||||
recent activity. It will be closed if no further activity occurs. Thank you
|
|
||||||
for your contributions.
|
|
||||||
# Comment to post when removing the stale label.
|
|
||||||
# unmarkComment: >
|
|
||||||
# Your comment here.
|
|
||||||
|
|
||||||
# Comment to post when closing a stale Issue or Pull Request.
|
|
||||||
closeComment: >
|
|
||||||
This issue will be auto-closed because there hasn't been any activity for a few months. Feel free to open a new one if you still experience this problem.
|
|
||||||
# Limit the number of actions per hour, from 1-30. Default is 30
|
|
||||||
limitPerRun: 30
|
|
||||||
|
|
||||||
# Limit to only `issues` or `pulls`
|
|
||||||
#only: issues
|
|
||||||
594
.github/workflows/CI_github.yml
vendored
594
.github/workflows/CI_github.yml
vendored
@ -1,594 +0,0 @@
|
|||||||
name: Tasmota CI
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
tasmota:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-minimal:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-minimal
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-lite:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-lite
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-knx:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-knx
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-sensors:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-sensors
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-display:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-display
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-ir:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-ir
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-zbbridge:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-zbbridge
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-BG:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-BG
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-BR:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-BR
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-CN:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-CN
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-CZ:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-CZ
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-DE:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-DE
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-ES:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-ES
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-FR:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-FR
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-GR:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-GR
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-HE:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-HE
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-HU:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-HU
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-IT:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-IT
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-KO:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-KO
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-NL:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-NL
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-PL:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-PL
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-PT:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-PT
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-RO:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-RO
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-RU:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-RU
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-SE:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-SE
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-SK:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-SK
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-TR:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-TR
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-TW:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-TW
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-UK:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-UK
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota-VN:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: platformio run -e tasmota-VN
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
625
.github/workflows/CI_github_ESP32.yml
vendored
625
.github/workflows/CI_github_ESP32.yml
vendored
@ -1,625 +0,0 @@
|
|||||||
name: Tasmota ESP32 CI
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
tasmota32:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-webcam:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-webcam
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-minimal:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-minimal
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-lite:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-lite
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-knx:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-knx
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-sensors:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-sensors
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-display:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-display
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-ir:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-ir
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-BG:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-BG
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-BR:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-BR
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-CN:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-CN
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-CZ:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-CZ
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-DE:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-DE
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-ES:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-ES
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-FR:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-FR
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-GR:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-GR
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-HE:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-HE
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-HU:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-HU
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-IT:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-IT
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-KO:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-KO
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-NL:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-NL
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-PL:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-PL
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-PT:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-PT
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-RO:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-RO
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-RU:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-RU
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-SE:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-SE
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-SK:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-SK
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-TR:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-TR
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-TW:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-TW
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-UK:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-UK
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
|
|
||||||
tasmota32-VN:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U platformio
|
|
||||||
platformio upgrade --dev
|
|
||||||
platformio update
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-VN
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output/firmware
|
|
||||||
1548
.github/workflows/Tasmota_build.yml
vendored
1548
.github/workflows/Tasmota_build.yml
vendored
File diff suppressed because it is too large
Load Diff
383
.gitignore
vendored
383
.gitignore
vendored
@ -1,30 +1,361 @@
|
|||||||
## OS specific ########
|
# ---> C++
|
||||||
.DS_Store
|
# Prerequisites
|
||||||
|
*.d
|
||||||
|
|
||||||
|
# Compiled Object files
|
||||||
|
*.slo
|
||||||
|
*.lo
|
||||||
|
*.o
|
||||||
|
*.obj
|
||||||
|
|
||||||
|
# Precompiled Headers
|
||||||
|
*.gch
|
||||||
|
*.pch
|
||||||
|
|
||||||
|
# Compiled Dynamic libraries
|
||||||
|
*.so
|
||||||
|
*.dylib
|
||||||
|
*.dll
|
||||||
|
|
||||||
|
# Fortran module files
|
||||||
|
*.mod
|
||||||
|
*.smod
|
||||||
|
|
||||||
|
# Compiled Static libraries
|
||||||
|
*.lai
|
||||||
|
*.la
|
||||||
|
*.a
|
||||||
|
*.lib
|
||||||
|
|
||||||
|
# Executables
|
||||||
|
*.exe
|
||||||
|
*.out
|
||||||
|
*.app
|
||||||
|
|
||||||
|
# ---> C
|
||||||
|
# Prerequisites
|
||||||
|
*.d
|
||||||
|
|
||||||
|
# Object files
|
||||||
|
*.o
|
||||||
|
*.ko
|
||||||
|
*.obj
|
||||||
|
*.elf
|
||||||
|
|
||||||
|
# Linker output
|
||||||
|
*.ilk
|
||||||
|
*.map
|
||||||
|
*.exp
|
||||||
|
|
||||||
|
# Precompiled Headers
|
||||||
|
*.gch
|
||||||
|
*.pch
|
||||||
|
|
||||||
|
# Libraries
|
||||||
|
*.lib
|
||||||
|
*.a
|
||||||
|
*.la
|
||||||
|
*.lo
|
||||||
|
|
||||||
|
# Shared objects (inc. Windows DLLs)
|
||||||
|
*.dll
|
||||||
|
*.so
|
||||||
|
*.so.*
|
||||||
|
*.dylib
|
||||||
|
|
||||||
|
# Executables
|
||||||
|
*.exe
|
||||||
|
*.out
|
||||||
|
*.app
|
||||||
|
*.i*86
|
||||||
|
*.x86_64
|
||||||
|
*.hex
|
||||||
|
|
||||||
|
# Debug files
|
||||||
|
*.dSYM/
|
||||||
|
*.su
|
||||||
|
*.idb
|
||||||
|
*.pdb
|
||||||
|
|
||||||
|
# Kernel Module Compile Results
|
||||||
|
*.mod*
|
||||||
|
*.cmd
|
||||||
|
.tmp_versions/
|
||||||
|
modules.order
|
||||||
|
Module.symvers
|
||||||
|
Mkfile.old
|
||||||
|
dkms.conf
|
||||||
|
|
||||||
|
# ---> CMake
|
||||||
|
CMakeLists.txt.user
|
||||||
|
CMakeCache.txt
|
||||||
|
CMakeFiles
|
||||||
|
CMakeScripts
|
||||||
|
Testing
|
||||||
|
Makefile
|
||||||
|
cmake_install.cmake
|
||||||
|
install_manifest.txt
|
||||||
|
compile_commands.json
|
||||||
|
CTestTestfile.cmake
|
||||||
|
_deps
|
||||||
|
|
||||||
|
# ---> JetBrains
|
||||||
|
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
|
||||||
|
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
|
||||||
|
|
||||||
|
# User-specific stuff
|
||||||
|
.idea/**/workspace.xml
|
||||||
|
.idea/**/tasks.xml
|
||||||
|
.idea/**/usage.statistics.xml
|
||||||
|
.idea/**/dictionaries
|
||||||
|
.idea/**/shelf
|
||||||
|
|
||||||
|
# AWS User-specific
|
||||||
|
.idea/**/aws.xml
|
||||||
|
|
||||||
|
# Generated files
|
||||||
|
.idea/**/contentModel.xml
|
||||||
|
|
||||||
|
# Sensitive or high-churn files
|
||||||
|
.idea/**/dataSources/
|
||||||
|
.idea/**/dataSources.ids
|
||||||
|
.idea/**/dataSources.local.xml
|
||||||
|
.idea/**/sqlDataSources.xml
|
||||||
|
.idea/**/dynamic.xml
|
||||||
|
.idea/**/uiDesigner.xml
|
||||||
|
.idea/**/dbnavigator.xml
|
||||||
|
|
||||||
|
# Gradle
|
||||||
|
.idea/**/gradle.xml
|
||||||
|
.idea/**/libraries
|
||||||
|
|
||||||
|
# Gradle and Maven with auto-import
|
||||||
|
# When using Gradle or Maven with auto-import, you should exclude module files,
|
||||||
|
# since they will be recreated, and may cause churn. Uncomment if using
|
||||||
|
# auto-import.
|
||||||
|
# .idea/artifacts
|
||||||
|
# .idea/compiler.xml
|
||||||
|
# .idea/jarRepositories.xml
|
||||||
|
# .idea/modules.xml
|
||||||
|
# .idea/*.iml
|
||||||
|
# .idea/modules
|
||||||
|
# *.iml
|
||||||
|
# *.ipr
|
||||||
|
|
||||||
|
# CMake
|
||||||
|
cmake-build-*/
|
||||||
|
|
||||||
|
# Mongo Explorer plugin
|
||||||
|
.idea/**/mongoSettings.xml
|
||||||
|
|
||||||
|
# File-based project format
|
||||||
|
*.iws
|
||||||
|
|
||||||
|
# IntelliJ
|
||||||
|
out/
|
||||||
|
|
||||||
|
# mpeltonen/sbt-idea plugin
|
||||||
|
.idea_modules/
|
||||||
|
|
||||||
|
# JIRA plugin
|
||||||
|
atlassian-ide-plugin.xml
|
||||||
|
|
||||||
|
# Cursive Clojure plugin
|
||||||
|
.idea/replstate.xml
|
||||||
|
|
||||||
|
# SonarLint plugin
|
||||||
|
.idea/sonarlint/
|
||||||
|
|
||||||
|
# Crashlytics plugin (for Android Studio and IntelliJ)
|
||||||
|
com_crashlytics_export_strings.xml
|
||||||
|
crashlytics.properties
|
||||||
|
crashlytics-build.properties
|
||||||
|
fabric.properties
|
||||||
|
|
||||||
|
# Editor-based Rest Client
|
||||||
|
.idea/httpRequests
|
||||||
|
|
||||||
|
# Android studio 3.1+ serialized cache file
|
||||||
|
.idea/caches/build_file_checksums.ser
|
||||||
|
|
||||||
|
# ---> Linux
|
||||||
|
*~
|
||||||
|
|
||||||
|
# temporary files which can be created if a process still has a handle open of a deleted file
|
||||||
.fuse_hidden*
|
.fuse_hidden*
|
||||||
*.pyc
|
|
||||||
|
|
||||||
## Project files ######
|
# KDE directory preferences
|
||||||
.platformio
|
.directory
|
||||||
.pio
|
|
||||||
.clang_complete
|
# Linux trash folder which might appear on any partition or disk
|
||||||
.gcc-flags.json
|
.Trash-*
|
||||||
|
|
||||||
|
# .nfs files are created when an open file is removed but is still being accessed
|
||||||
|
.nfs*
|
||||||
|
|
||||||
|
# ---> Ninja
|
||||||
|
.ninja_deps
|
||||||
|
.ninja_log
|
||||||
|
|
||||||
|
# ---> Python
|
||||||
|
# Byte-compiled / optimized / DLL files
|
||||||
|
__pycache__/
|
||||||
|
*.py[cod]
|
||||||
|
*$py.class
|
||||||
|
|
||||||
|
# C extensions
|
||||||
|
*.so
|
||||||
|
|
||||||
|
# Distribution / packaging
|
||||||
|
.Python
|
||||||
|
build/
|
||||||
|
develop-eggs/
|
||||||
|
dist/
|
||||||
|
downloads/
|
||||||
|
eggs/
|
||||||
|
.eggs/
|
||||||
|
lib/
|
||||||
|
lib64/
|
||||||
|
parts/
|
||||||
|
sdist/
|
||||||
|
var/
|
||||||
|
wheels/
|
||||||
|
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
|
.cache
|
||||||
tasmota/user_config_override.h
|
nosetests.xml
|
||||||
build
|
coverage.xml
|
||||||
build_output
|
*.cover
|
||||||
firmware.map
|
*.py,cover
|
||||||
firmware.asm
|
.hypothesis/
|
||||||
tasmota/tasmota.ino.cpp
|
.pytest_cache/
|
||||||
tasmota*.bin
|
cover/
|
||||||
tasmota*.bin.gz
|
|
||||||
tasmota*.map
|
# Translations
|
||||||
platformio_override.ini
|
*.mo
|
||||||
platformio_tasmota_cenv.ini
|
*.pot
|
||||||
|
|
||||||
|
# Django stuff:
|
||||||
|
*.log
|
||||||
|
local_settings.py
|
||||||
|
db.sqlite3
|
||||||
|
db.sqlite3-journal
|
||||||
|
|
||||||
|
# Flask stuff:
|
||||||
|
instance/
|
||||||
|
.webassets-cache
|
||||||
|
|
||||||
|
# Scrapy stuff:
|
||||||
|
.scrapy
|
||||||
|
|
||||||
|
# Sphinx documentation
|
||||||
|
docs/_build/
|
||||||
|
|
||||||
|
# PyBuilder
|
||||||
|
.pybuilder/
|
||||||
|
target/
|
||||||
|
|
||||||
|
# Jupyter Notebook
|
||||||
|
.ipynb_checkpoints
|
||||||
|
|
||||||
|
# IPython
|
||||||
|
profile_default/
|
||||||
|
ipython_config.py
|
||||||
|
|
||||||
|
# pyenv
|
||||||
|
# For a library or package, you might want to ignore these files since the code is
|
||||||
|
# intended to run in multiple environments; otherwise, check them in:
|
||||||
|
# .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
|
||||||
|
|
||||||
|
# poetry
|
||||||
|
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
|
||||||
|
# This is especially recommended for binary packages to ensure reproducibility, and is more
|
||||||
|
# commonly ignored for libraries.
|
||||||
|
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
|
||||||
|
#poetry.lock
|
||||||
|
|
||||||
|
# pdm
|
||||||
|
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
|
||||||
|
#pdm.lock
|
||||||
|
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
|
||||||
|
# in version control.
|
||||||
|
# https://pdm.fming.dev/#use-with-ide
|
||||||
|
.pdm.toml
|
||||||
|
|
||||||
|
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
|
||||||
|
__pypackages__/
|
||||||
|
|
||||||
|
# Celery stuff
|
||||||
|
celerybeat-schedule
|
||||||
|
celerybeat.pid
|
||||||
|
|
||||||
|
# SageMath parsed files
|
||||||
|
*.sage.py
|
||||||
|
|
||||||
|
# Environments
|
||||||
|
.env
|
||||||
|
.venv
|
||||||
|
env/
|
||||||
|
venv/
|
||||||
|
ENV/
|
||||||
|
env.bak/
|
||||||
|
venv.bak/
|
||||||
|
|
||||||
|
# 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/
|
||||||
|
|
||||||
|
# Cython debug symbols
|
||||||
|
cython_debug/
|
||||||
|
|
||||||
|
# PyCharm
|
||||||
|
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
|
||||||
|
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
|
||||||
|
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
||||||
|
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||||
|
#.idea/
|
||||||
|
|
||||||
## Visual Studio Code specific ######
|
|
||||||
.vscode
|
|
||||||
.vscode/.browse.c_cpp.db*
|
|
||||||
.vscode/c_cpp_properties.json
|
|
||||||
.vscode/launch.json
|
|
||||||
*.bak
|
|
||||||
*.code-workspace
|
|
||||||
|
|||||||
5
.gitpod.Dockerfile
vendored
5
.gitpod.Dockerfile
vendored
@ -1,5 +0,0 @@
|
|||||||
FROM gitpod/workspace-full
|
|
||||||
|
|
||||||
USER gitpod
|
|
||||||
|
|
||||||
RUN pip3 install -U platformio && brew install uncrustify
|
|
||||||
13
.gitpod.yml
13
.gitpod.yml
@ -1,13 +0,0 @@
|
|||||||
tasks:
|
|
||||||
- command: platformio run -e tasmota
|
|
||||||
|
|
||||||
image:
|
|
||||||
file: .gitpod.Dockerfile
|
|
||||||
|
|
||||||
vscode:
|
|
||||||
extensions:
|
|
||||||
- ms-vscode.cpptools@0.26.3:u3GsZ5PK12Ddr79vh4TWgQ==
|
|
||||||
- eamodio.gitlens@10.2.1:e0IYyp0efFqVsrZwsIe8CA==
|
|
||||||
- LaurentTreguier.uncrustify@2.18.0:/k8Osjj/XSuz09F+pEu7wg==
|
|
||||||
- Atishay-Jain.All-Autocomplete@0.0.23:fbZNfSpnd8XkAHGfAPS2rA==
|
|
||||||
- 2gua.rainbow-brackets@0.0.6:Tbu8dTz0i+/bgcKQTQ5b8g==
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
language: python
|
|
||||||
python:
|
|
||||||
- '3.7'
|
|
||||||
sudo: false
|
|
||||||
install:
|
|
||||||
- pip install -U platformio
|
|
||||||
- platformio upgrade --dev
|
|
||||||
- platformio update
|
|
||||||
|
|
||||||
cache: false
|
|
||||||
|
|
||||||
env:
|
|
||||||
- ENV=tasmota
|
|
||||||
- ENV=tasmota-minimal
|
|
||||||
- ENV=tasmota-lite
|
|
||||||
- ENV=tasmota-knx
|
|
||||||
- ENV=tasmota-sensors
|
|
||||||
- ENV=tasmota-display
|
|
||||||
- ENV=tasmota-ir
|
|
||||||
- ENV=tasmota-BG
|
|
||||||
- ENV=tasmota-BR
|
|
||||||
- ENV=tasmota-CN
|
|
||||||
- ENV=tasmota-CZ
|
|
||||||
- ENV=tasmota-DE
|
|
||||||
- ENV=tasmota-ES
|
|
||||||
- ENV=tasmota-FR
|
|
||||||
- ENV=tasmota-GR
|
|
||||||
- ENV=tasmota-HE
|
|
||||||
- ENV=tasmota-HU
|
|
||||||
- ENV=tasmota-IT
|
|
||||||
- ENV=tasmota-KO
|
|
||||||
- ENV=tasmota-NL
|
|
||||||
- ENV=tasmota-PL
|
|
||||||
- ENV=tasmota-PT
|
|
||||||
- ENV=tasmota-RO
|
|
||||||
- ENV=tasmota-RU
|
|
||||||
- ENV=tasmota-SE
|
|
||||||
- ENV=tasmota-SK
|
|
||||||
- ENV=tasmota-TR
|
|
||||||
- ENV=tasmota-TW
|
|
||||||
- ENV=tasmota-UK
|
|
||||||
- ENV=tasmota-VN
|
|
||||||
|
|
||||||
script:
|
|
||||||
- platformio run -e $ENV
|
|
||||||
before_deploy:
|
|
||||||
- for file in .pioenvs/*/firmware.bin; do cp $file ${file%/*}.bin; done
|
|
||||||
150
API.md
150
API.md
@ -1,150 +0,0 @@
|
|||||||
<img src="/tools/logo/TASMOTA_FullLogo_Vector.svg" alt="Logo" align="right" height="76"/>
|
|
||||||
|
|
||||||
# Basic API information
|
|
||||||
|
|
||||||
Tasmota can easily be extended by developers using provided function pointers as callback Ids. This document lists the available callback function Ids. Read [Sensor API](https://tasmota.github.io/docs/Sensor-API) for more information.
|
|
||||||
|
|
||||||
Callback availability can be checked by searching for either XdrvCall, XsnsCall, XdspCall, XnrgCall and XlgtCall.
|
|
||||||
|
|
||||||
## Driver, Sensor, Energy and Light Callback Ids
|
|
||||||
|
|
||||||
The following table lists Callback Ids and their availability for a Driver, Sensor or Energy service.
|
|
||||||
|
|
||||||
Callback Id | Bool | xdrv | xsns | xnrg | xlgt | Description
|
|
||||||
----------------------------|------|------|------|------|------|----------------------------------
|
|
||||||
FUNC_SETTINGS_OVERRIDE | | x | | | | Override start-up settings
|
|
||||||
FUNC_PIN_STATE | x | 1 | 2 | | | At GPIO configuration
|
|
||||||
FUNC_MODULE_INIT | x | 1 | | | 2 | Init module specific parameters
|
|
||||||
FUNC_PRE_INIT | | 1 | | 2 | | Once GPIO have been established
|
|
||||||
FUNC_INIT | | 1 | 3 | 2 | | At end of initialisation
|
|
||||||
FUNC_LOOP | | 1 | 2 | | | In main loop
|
|
||||||
FUNC_EVERY_50_MSECOND | | 1 | 2 | | |
|
|
||||||
FUNC_EVERY_100_MSECOND | | 1 | 2 | | |
|
|
||||||
FUNC_EVERY_200_MSECOND | | | | x | |
|
|
||||||
FUNC_EVERY_250_MSECOND | | 1 | 3 | 2 | |
|
|
||||||
FUNC_EVERY_SECOND | | 1 | 2 | | |
|
|
||||||
FUNC_SAVE_AT_MIDNIGHT | | | x | | | At midnight
|
|
||||||
FUNC_SAVE_BEFORE_RESTART | | 2 | 1 | | | Just before a planned restart
|
|
||||||
FUNC_AFTER_TELEPERIOD | | 2 | 1 | | | At end of teleperiod
|
|
||||||
FUNC_JSON_APPEND | | 2 | 1 | 3 | | Extend teleperiod JSON text
|
|
||||||
FUNC_WEB_SENSOR | | 2 | 1 | 3 | | Add sensor data to web GUI
|
|
||||||
FUNC_COMMAND | x | 1 | 2 | 3 | 4 | When a command is not recognized
|
|
||||||
FUNC_COMMAND_DRIVER | x | x | | | | When command Driver\<id\> is executed
|
|
||||||
FUNC_COMMAND_SENSOR | x | | x | | | When command Sensor\<id\> is executed
|
|
||||||
FUNC_MQTT_SUBSCRIBE | | x | | | | At end of MQTT subscriptions
|
|
||||||
FUNC_MQTT_INIT | | x | | | | Once at end of MQTT connection
|
|
||||||
FUNC_MQTT_DATA | x | x | | | | Before decoding command
|
|
||||||
FUNC_SET_POWER | | x | | | | Before setting relays
|
|
||||||
FUNC_SET_DEVICE_POWER | x | x | | | | Set relay
|
|
||||||
FUNC_SHOW_SENSOR | | x | | | | When FUNC_JSON_APPEND completes
|
|
||||||
FUNC_ANY_KEY | | x | | | |
|
|
||||||
FUNC_ENERGY_EVERY_SECOND | | | | x | |
|
|
||||||
FUNC_ENERGY_RESET | | | | x | |
|
|
||||||
FUNC_RULES_PROCESS | x | x | | | | Process specific rule
|
|
||||||
FUNC_SERIAL | x | 1 | | 2 | 3 | Process serial data
|
|
||||||
FUNC_FREE_MEM | | x | | | | Show free memory for debugging
|
|
||||||
FUNC_BUTTON_PRESSED | x | x | | | | When a button is pressed
|
|
||||||
FUNC_WEB_ADD_BUTTON | | 1 | 2 | | | Add a Configuration Button to GUI
|
|
||||||
FUNC_WEB_ADD_MAIN_BUTTON | | 1 | 2 | | | Add a main button to GUI
|
|
||||||
FUNC_WEB_ADD_HANDLER | | 1 | 2 | | | Add a webserver handler
|
|
||||||
FUNC_SET_CHANNELS | | 2 | | | 1 |
|
|
||||||
FUNC_SET_SCHEME | | | | | x |
|
|
||||||
|
|
||||||
The numbers represent the sequence of execution
|
|
||||||
|
|
||||||
## Display Call back Ids
|
|
||||||
|
|
||||||
The following table lists all Callback Ids for a Display service.
|
|
||||||
|
|
||||||
Callback Id | Bool | Description
|
|
||||||
------------------------------|------|---------------------
|
|
||||||
FUNC_DISPLAY_INIT_DRIVER | |
|
|
||||||
FUNC_DISPLAY_INIT | |
|
|
||||||
FUNC_DISPLAY_EVERY_50_MSECOND | |
|
|
||||||
FUNC_DISPLAY_EVERY_SECOND | |
|
|
||||||
FUNC_DISPLAY_MODEL | x |
|
|
||||||
FUNC_DISPLAY_MODE | |
|
|
||||||
FUNC_DISPLAY_POWER | |
|
|
||||||
FUNC_DISPLAY_CLEAR | |
|
|
||||||
FUNC_DISPLAY_DRAW_FRAME | |
|
|
||||||
FUNC_DISPLAY_DRAW_HLINE | |
|
|
||||||
FUNC_DISPLAY_DRAW_VLINE | |
|
|
||||||
FUNC_DISPLAY_DRAW_LINE | |
|
|
||||||
FUNC_DISPLAY_DRAW_CIRCLE | |
|
|
||||||
FUNC_DISPLAY_FILL_CIRCLE | |
|
|
||||||
FUNC_DISPLAY_DRAW_RECTANGLE | |
|
|
||||||
FUNC_DISPLAY_FILL_RECTANGLE | |
|
|
||||||
FUNC_DISPLAY_TEXT_SIZE | |
|
|
||||||
FUNC_DISPLAY_FONT_SIZE | |
|
|
||||||
FUNC_DISPLAY_ROTATION | |
|
|
||||||
FUNC_DISPLAY_DRAW_STRING | |
|
|
||||||
FUNC_DISPLAY_ONOFF | |
|
|
||||||
|
|
||||||
## Init sequence
|
|
||||||
|
|
||||||
The following list shows a typical callback init sequence
|
|
||||||
|
|
||||||
```
|
|
||||||
CFG: Loaded from flash at FB, Count 1581
|
|
||||||
xdrv - FUNC_SETTINGS_OVERRIDE
|
|
||||||
xdrv - FUNC_PIN_STATE
|
|
||||||
xsns - FUNC_PIN_STATE
|
|
||||||
xdrv - FUNC_MODULE_INIT
|
|
||||||
xlgt - FUNC_MODULE_INIT
|
|
||||||
xdrv - FUNC_PRE_INIT
|
|
||||||
xnrg - FUNC_PRE_INIT
|
|
||||||
SRC: Restart
|
|
||||||
xdrv - FUNC_SET_POWER
|
|
||||||
xlgt - FUNC_SET_CHANNELS
|
|
||||||
xdrv - FUNC_SET_DEVICE_POWER
|
|
||||||
Project tasmota Wemos 2 Version 7.0.0.3(tasmota)-STAGE
|
|
||||||
xdrv - FUNC_INIT
|
|
||||||
xsns - FUNC_INIT
|
|
||||||
I2C: ADS1115 found at 0x48
|
|
||||||
xdrv - FUNC_LOOP
|
|
||||||
xsns - FUNC_LOOP
|
|
||||||
xdrv - FUNC_EVERY_50_MSECOND
|
|
||||||
xlgt - FUNC_SET_CHANNELS
|
|
||||||
xsns - FUNC_EVERY_50_MSECOND
|
|
||||||
xdrv - FUNC_EVERY_100_MSECOND
|
|
||||||
xsns - FUNC_EVERY_100_MSECOND
|
|
||||||
xdrv - FUNC_EVERY_250_MSECOND
|
|
||||||
xsns - FUNC_EVERY_250_MSECOND
|
|
||||||
xdrv - FUNC_EVERY_SECOND
|
|
||||||
xsns - FUNC_EVERY_SECOND
|
|
||||||
WIF: Attempting connection...
|
|
||||||
WIF: Network (re)scan started...
|
|
||||||
WIF: Attempting connection...
|
|
||||||
WIF: Attempting connection...
|
|
||||||
WIF: Attempting connection...
|
|
||||||
WIF: Network 0, AP1, SSId indebuurt1, Channel 1, BSSId 24:D3:F2:97:C0:A1, RSSI -86, Encryption 1
|
|
||||||
WIF: Network 1, AP2, SSId indebuurt2, Channel 5, BSSId A0:AB:1B:7D:42:AC, RSSI -42, Encryption 1
|
|
||||||
WIF: Network 2, AP-, SSId indebuurt3, Channel 12, BSSId 60:E3:27:58:77:E6, RSSI -84, Encryption 1
|
|
||||||
WIF: Connecting to AP2 indebuurt2 in mode 11N as wemos2...
|
|
||||||
WIF: Attempting connection...
|
|
||||||
WIF: Attempting connection...
|
|
||||||
WIF: Attempting connection...
|
|
||||||
WIF: Connected
|
|
||||||
xdrv - FUNC_WEB_ADD_HANDLER
|
|
||||||
xsns - FUNC_WEB_ADD_HANDLER
|
|
||||||
HTP: Web server active on wemos2 with IP address 192.168.2.191
|
|
||||||
NTP: Drift 0, (UTC) Wed Nov 06 13:57:08 2019, (DST) Sun Mar 31 02:00:00 2019, (STD) Sun Oct 27 03:00:00 2019
|
|
||||||
APP: Boot Count 500
|
|
||||||
MQT: Attempting connection...
|
|
||||||
MQT: Connected
|
|
||||||
MQT: tele/wemos2/LWT = Online (retained)
|
|
||||||
MQT: cmnd/wemos2/POWER =
|
|
||||||
MQT: Subscribe to cmnd/wemos2/#
|
|
||||||
MQT: Subscribe to cmnd/sonoffs/#
|
|
||||||
MQT: Subscribe to cmnd/DVES_15568C_fb/#
|
|
||||||
xdrv - FUNC_MQTT_SUBSCRIBE
|
|
||||||
MQT: tele/wemos2/INFO1 = {"Module":"Generic","Version":"7.0.0.3(tasmota)","FallbackTopic":"cmnd/DVES_15568C_fb/","GroupTopic":"cmnd/sonoffs/"}
|
|
||||||
MQT: tele/wemos2/INFO2 = {"WebServerMode":"Admin","Hostname":"wemos2","IPAddress":"192.168.2.191"}
|
|
||||||
MQT: tele/wemos2/INFO3 = {"RestartReason":"Software/System restart"}
|
|
||||||
MQT: stat/wemos2/RESULT = {"POWER1":"OFF"}
|
|
||||||
MQT: stat/wemos2/POWER1 = OFF
|
|
||||||
MQT: stat/wemos2/RESULT = {"POWER2":"ON"}
|
|
||||||
MQT: stat/wemos2/POWER2 = ON
|
|
||||||
xdrv - FUNC_MQTT_INIT
|
|
||||||
CFG: Saved to flash at FA, Count 1582, Bytes 4096
|
|
||||||
```
|
|
||||||
211
BUILDS.md
211
BUILDS.md
@ -1,211 +0,0 @@
|
|||||||
## Available Features and Sensors
|
|
||||||
|
|
||||||
| Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | Remarks
|
|
||||||
|-----------------------|---------|-------|--------|-----|---------|----|---------|--------
|
|
||||||
| MY_LANGUAGE en_GB | x | x | x | x | x | x | x |
|
|
||||||
| USE_ARDUINO_OTA | - | - | - | - | - | - | - |
|
|
||||||
| USE_DOMOTICZ | - | - | x | x | x | x | - |
|
|
||||||
| USE_HOME_ASSISTANT | - | - | x | x | x | x | - |
|
|
||||||
| USE_MQTT_TLS | - | - | - | - | - | - | - |
|
|
||||||
| USE_MQTT_TLS_CA_CERT | - | - | - | - | - | - | - |
|
|
||||||
| USE_MQTT_AWS_IOT | - | - | - | - | - | - | - |
|
|
||||||
| USE_4K_RSA | - | - | - | - | - | - | - |
|
|
||||||
| USE_TELEGRAM | - | - | - | - | - | - | - |
|
|
||||||
| USE_KNX | - | - | - | x | - | - | - |
|
|
||||||
| USE_WEBSERVER | x | x | x | x | x | x | x |
|
|
||||||
| USE_JAVASCRIPT_ES6 | - | - | - | - | - | - | - |
|
|
||||||
| USE_WEBSEND_RESPONSE | - | - | - | - | - | - | - |
|
|
||||||
| USE_EMULATION_HUE | - | x | x | - | x | - | - |
|
|
||||||
| USE_EMULATION_WEMO | - | x | x | - | x | - | - |
|
|
||||||
| USE_DISCOVERY | - | - | x | x | - | - | x |
|
|
||||||
| WEBSERVER_ADVERTISE | - | - | x | x | - | - | x |
|
|
||||||
| MQTT_HOST_DISCOVERY | - | - | x | x | - | - | x |
|
|
||||||
| USE_TIMERS | - | x | x | x | x | x | x |
|
|
||||||
| USE_TIMERS_WEB | - | x | x | x | x | x | x |
|
|
||||||
| USE_SUNRISE | - | x | x | x | x | x | x |
|
|
||||||
| USE_RULES | - | x | x | x | x | x | x |
|
|
||||||
| USE_SCRIPT | - | - | - | - | - | - | - |
|
|
||||||
| USE_EXPRESSION | - | - | - | - | - | - | - |
|
|
||||||
| SUPPORT_IF_STATEMENT | - | - | - | - | - | - | - |
|
|
||||||
| USE_HOTPLUG | - | - | - | - | - | - | - |
|
|
||||||
| USE_PROMETHEUS | - | - | - | - | - | - | - | Enables the `/metrics` endpoint
|
|
||||||
| | | | | | | | |
|
|
||||||
| Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | Remarks
|
|
||||||
| ROTARY_V1 | - | - | x | - | x | - | - |
|
|
||||||
| USE_SONOFF_RF | - | - | x | x | x | - | - |
|
|
||||||
| USE_RF_FLASH | - | - | x | x | x | - | - |
|
|
||||||
| USE_SONOFF_SC | - | - | x | x | x | - | - |
|
|
||||||
| USE_TUYA_MCU | - | x | x | x | x | - | x |
|
|
||||||
| USE_ARMTRONIX_DIMMERS | - | - | x | x | - | - | - |
|
|
||||||
| USE_PS_16_DZ | - | - | x | x | - | - | - |
|
|
||||||
| USE_SONOFF_IFAN | - | - | x | x | - | - | - |
|
|
||||||
| USE_BUZZER | - | - | x | x | x | - | - |
|
|
||||||
| USE_ARILUX_RF | - | - | x | x | - | - | - |
|
|
||||||
| USE_SHUTTER | - | - | x | x | - | - | - |
|
|
||||||
| USE_DEEPSLEEP | - | - | x | - | x | - | - |
|
|
||||||
| USE_EXS_DIMMER | - | - | x | x | - | - | - |
|
|
||||||
| USE_DEVICE_GROUPS | - | - | x | - | - | - | - |
|
|
||||||
| USE_PWM_DIMMER | - | - | x | x | - | - | - |
|
|
||||||
| USE_KEELOQ | - | - | - | - | - | - | - |
|
|
||||||
| USE_SONOFF_D1 | - | - | x | x | - | - | - |
|
|
||||||
| | | | | | | | |
|
|
||||||
| Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | Remarks
|
|
||||||
| USE_LIGHT | - | x | x | x | x | x | x |
|
|
||||||
| USE_WS2812 | - | - | x | x | x | - | x |
|
|
||||||
| USE_WS2812_DMA | - | - | - | - | - | - | - |
|
|
||||||
| USE_MY92X1 | - | - | x | x | x | - | x |
|
|
||||||
| USE_SM16716 | - | - | x | x | x | - | x |
|
|
||||||
| USE_SM2135 | - | - | x | x | x | - | x |
|
|
||||||
| USE_SONOFF_L1 | - | - | x | x | x | - | x |
|
|
||||||
| USE_ELECTRIQ_MOODL | - | - | x | x | x | - | x |
|
|
||||||
| | | | | | | | |
|
|
||||||
| USE_ENERGY_SENSOR | - | x | x | x | x | - | - |
|
|
||||||
| USE_PZEM004T | - | - | x | x | x | - | - |
|
|
||||||
| USE_PZEM_AC | - | - | x | x | x | - | - |
|
|
||||||
| USE_PZEM_DC | - | - | x | x | x | - | - |
|
|
||||||
| USE_MCP39F501 | - | x | x | x | x | - | - |
|
|
||||||
| USE_SDM120 | - | - | - | - | x | - | - |
|
|
||||||
| USE_SDM630 | - | - | - | - | x | - | - |
|
|
||||||
| USE_DDS2382 | - | - | - | - | x | - | - |
|
|
||||||
| USE_DDSU666 | - | - | - | - | x | - | - |
|
|
||||||
| USE_SOLAX_X1 | - | - | - | - | - | - | - |
|
|
||||||
| USE_LE01MR | - | - | - | - | - | - | - |
|
|
||||||
| USE_BL0940 | - | x | x | x | x | - | - |
|
|
||||||
| USE_TELEINFO | - | - | - | - | - | - | - |
|
|
||||||
| USE_IEM3000 | - | - | - | - | - | - | - |
|
|
||||||
| USE_WE517 | - | - | - | - | - | - | - |
|
|
||||||
| | | | | | | | |
|
|
||||||
| USE_ADC_VCC | x | x | - | - | - | x | - |
|
|
||||||
| USE_COUNTER | - | - | x | x | x | - | x |
|
|
||||||
| USE_DS18x20 | - | - | x | x | x | - | x |
|
|
||||||
| USE_DHT | - | - | x | x | x | - | x |
|
|
||||||
| USE_MAX31855 | - | - | - | - | x | - | - |
|
|
||||||
| USE_MAX31865 | - | - | - | - | - | - | - |
|
|
||||||
| USE_THERMOSTAT | - | - | - | - | - | - | - |
|
|
||||||
| USE_LMT01 | - | - | - | - | x | - | - |
|
|
||||||
| | | | | | | | |
|
|
||||||
| Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | Remarks
|
|
||||||
| USE_I2C | - | - | x | x | x | - | x |
|
|
||||||
| USE_SHT | - | - | - | - | x | - | - |
|
|
||||||
| USE_HTU | - | - | - | - | x | - | - |
|
|
||||||
| USE_BMP | - | - | - | - | x | - | - |
|
|
||||||
| USE_BME680 | - | - | - | - | x | - | - |
|
|
||||||
| USE_BH1750 | - | - | - | - | x | - | - |
|
|
||||||
| USE_VEML6070 | - | - | - | - | x | - | - |
|
|
||||||
| USE_ADS1115 | - | - | - | - | x | - | - |
|
|
||||||
| USE_INA219 | - | - | - | - | x | - | - |
|
|
||||||
| USE_INA226 | - | - | - | - | - | - | - |
|
|
||||||
| USE_SHT3X | - | - | - | - | x | - | - |
|
|
||||||
| USE_TSL2561 | - | - | - | - | x | - | - |
|
|
||||||
| USE_TSL2591 | - | - | - | - | - | - | - |
|
|
||||||
| USE_MGS | - | - | - | - | x | - | - |
|
|
||||||
| USE_SGP30 | - | - | - | - | x | - | - |
|
|
||||||
| USE_SI1145 | - | - | - | - | - | - | - |
|
|
||||||
| USE_LM75AD | - | - | - | - | x | - | - |
|
|
||||||
| USE_APDS9960 | - | - | - | - | - | - | - |
|
|
||||||
| USE_MCP230xx | - | - | - | - | - | - | - |
|
|
||||||
| USE_PCA9685 | - | - | - | - | - | - | - |
|
|
||||||
| USE_MPR121 | - | - | - | - | - | - | - |
|
|
||||||
| USE_CCS811 | - | - | - | - | x | - | - |
|
|
||||||
| USE_MPU6050 | - | - | - | - | - | - | - |
|
|
||||||
| USE_DS3231 | - | - | - | - | - | - | - |
|
|
||||||
| USE_MGC3130 | - | - | - | - | - | - | - |
|
|
||||||
| USE_MAX44009 | - | - | - | - | - | - | - |
|
|
||||||
| USE_SCD30 | - | - | - | - | x | - | - |
|
|
||||||
| USE_SPS30 | - | - | - | - | - | - | - |
|
|
||||||
| USE_ADE7953 | - | - | x | x | x | - | x |
|
|
||||||
| USE_VL53L0X | - | - | - | - | - | - | - |
|
|
||||||
| USE_MLX90614 | - | - | - | - | - | - | - |
|
|
||||||
| USE_CHIRP | - | - | - | - | - | - | - |
|
|
||||||
| USE_PAJ7620 | - | - | - | - | - | - | - |
|
|
||||||
| USE_PCF8574 | - | - | - | - | - | - | - |
|
|
||||||
| | | | | | | | |
|
|
||||||
| Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | Remarks
|
|
||||||
| USE_HIH6 | - | - | - | - | x | - | - |
|
|
||||||
| USE_DHT12 | - | - | - | - | x | - | - |
|
|
||||||
| USE_DS1624 | - | - | - | - | x | - | - |
|
|
||||||
| USE_AHT1x | - | - | - | - | - | - | - |
|
|
||||||
| USE_HDC1080 | - | - | - | - | - | - | - |
|
|
||||||
| USE_WEMOS_MOTOR_V1 | - | - | - | - | x | - | - |
|
|
||||||
| USE_IAQ | - | - | - | - | x | - | - |
|
|
||||||
| USE_AS3935 | - | - | - | - | x | - | - |
|
|
||||||
| USE_VEML6075 | - | - | - | - | - | - | - |
|
|
||||||
| USE_VEML7700 | - | - | - | - | - | - | - |
|
|
||||||
| USE_MCP9808 | - | - | - | - | - | - | - |
|
|
||||||
| USE_HP303B | - | - | - | - | - | - | - |
|
|
||||||
| USE_EZOCO2 | - | - | - | - | - | - | - |
|
|
||||||
| USE_EZODO | - | - | - | - | - | - | - |
|
|
||||||
| USE_EZOEC | - | - | - | - | - | - | - |
|
|
||||||
| USE_EZOFLO | - | - | - | - | - | - | - |
|
|
||||||
| USE_EZOHUM | - | - | - | - | - | - | - |
|
|
||||||
| USE_EZOO2 | - | - | - | - | - | - | - |
|
|
||||||
| USE_EZOORP | - | - | - | - | - | - | - |
|
|
||||||
| USE_EZOPH | - | - | - | - | - | - | - |
|
|
||||||
| USE_EZOPRS | - | - | - | - | - | - | - |
|
|
||||||
| USE_EZORGB | - | - | - | - | - | - | - |
|
|
||||||
| USE_EZORTD | - | - | - | - | - | - | - |
|
|
||||||
| | | | | | | | |
|
|
||||||
| Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | Remarks
|
|
||||||
| USE_SPI | - | - | - | - | - | - | x |
|
|
||||||
| USE_MHZ19 | - | - | - | - | x | - | - |
|
|
||||||
| USE_SENSEAIR | - | - | - | - | x | - | - |
|
|
||||||
| USE_PMS5003 | - | - | - | - | x | - | - |
|
|
||||||
| USE_NOVA_SDS | - | - | - | - | x | - | - |
|
|
||||||
| USE_HPMA | - | - | - | - | x | - | - |
|
|
||||||
| USE_SERIAL_BRIDGE | - | - | x | x | x | - | x |
|
|
||||||
| USE_MP3_PLAYER | - | - | - | - | x | - | - |
|
|
||||||
| USE_AZ7798 | - | - | - | - | - | - | - |
|
|
||||||
| USE_PN532_HSU | - | - | - | - | x | - | - |
|
|
||||||
| USE_RDM6300 | - | - | - | - | x | - | - |
|
|
||||||
| USE_IBEACON | - | - | - | - | x | - | - |
|
|
||||||
| USE_GPS | - | - | - | - | - | - | - |
|
|
||||||
| USE_HM10 | - | - | - | - | x | - | - |
|
|
||||||
| USE_HRXL | - | - | - | - | x | - | - |
|
|
||||||
| USE_TASMOTA_CLIENT | - | - | - | - | - | - | - |
|
|
||||||
| USE_OPENTHERM | - | - | - | - | - | - | - |
|
|
||||||
| USE_MIEL_HVAC | - | - | - | - | - | - | - |
|
|
||||||
| USE_TCP_BRIDGE | - | - | - | - | - | - | - | zbbridge
|
|
||||||
| | | | | | | | |
|
|
||||||
| USE_NRF24 | - | - | - | - | - | - | - |
|
|
||||||
| USE_MIBLE | - | - | - | - | - | - | - |
|
|
||||||
| USE_ZIGBEE | - | - | - | - | - | - | - |
|
|
||||||
| USE_ZIGBEE_ZNP | - | - | - | - | - | - | - |
|
|
||||||
| USE_ZIGBEE_EZSP | - | - | - | - | - | - | - | Sonoff ZbBridge
|
|
||||||
| | | | | | | | |
|
|
||||||
| USE_IR_REMOTE | - | - | x | x | x | x | x |
|
|
||||||
| USE_IR_RECEIVE | - | - | x | x | x | x | x |
|
|
||||||
| USE_IR_REMOTE_FULL | - | - | - | - | - | x | - | Enable ALL protocols
|
|
||||||
| | | | | | | | |
|
|
||||||
| USE_SR04 | - | - | - | - | x | - | - |
|
|
||||||
| USE_DYP | - | - | - | - | - | - | - |
|
|
||||||
| USE_TM1638 | - | - | - | - | x | - | - |
|
|
||||||
| USE_HX711 | - | - | - | - | x | - | - |
|
|
||||||
| USE_TX2x_WIND_SENSOR | - | - | - | - | - | - | - |
|
|
||||||
| USE_WINDMETER | - | - | - | - | - | - | - |
|
|
||||||
| USE_RC_SWITCH | - | - | - | - | x | - | - |
|
|
||||||
| USE_RF_SENSOR | - | - | - | - | x | - | - | AlectoV2 only
|
|
||||||
| USE_HRE | - | - | - | - | x | - | - |
|
|
||||||
| USE_A4988_STEPPER | - | - | - | - | - | - | - |
|
|
||||||
| | | | | | | | |
|
|
||||||
| Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | Remarks
|
|
||||||
| USE_DISPLAY | - | - | - | - | - | - | x |
|
|
||||||
| USE_DISPLAY_LCD | - | - | - | - | - | - | x |
|
|
||||||
| USE_DISPLAY_SSD1306 | - | - | - | - | - | - | x |
|
|
||||||
| USE_DISPLAY_MATRIX | - | - | - | - | - | - | x |
|
|
||||||
| USE_DISPLAY_SH1106 | - | - | - | - | - | - | x |
|
|
||||||
| USE_DISPLAY_ILI9341 | - | - | - | - | - | - | x |
|
|
||||||
| USE_DISPLAY_EPAPER_29 | - | - | - | - | - | - | x |
|
|
||||||
| USE_DISPLAY_EPAPER_42 | - | - | - | - | - | - | x |
|
|
||||||
| USE_DISPLAY_ILI9488 | - | - | - | - | - | - | - |
|
|
||||||
| USE_DISPLAY_SSD1351 | - | - | - | - | - | - | - |
|
|
||||||
| USE_DISPLAY_RA8876 | - | - | - | - | - | - | - |
|
|
||||||
|
|
||||||
## Additional Features and Sensors on ESP32
|
|
||||||
|
|
||||||
| Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | webcam | Remarks
|
|
||||||
|-----------------------|---------|-------|--------|-----|---------|----|---------|--------|--------
|
|
||||||
| USE_MI_ESP32 | - | - | - | - | - | - | - | - |
|
|
||||||
| USE_WEBCAM | - | - | - | - | - | - | - | x |
|
|
||||||
| USE_ETHERNET | - | - | - | - | - | - | - | - |
|
|
||||||
| USE_I2S_AUDIO | - | - | - | - | - | - | - | - |
|
|
||||||
| USE_TTGO_WATCH | - | - | - | - | - | - | - | - |
|
|
||||||
2880
CHANGELOG.md
2880
CHANGELOG.md
File diff suppressed because it is too large
Load Diff
@ -1,130 +0,0 @@
|
|||||||
|
|
||||||
# Contributor Covenant Code of Conduct
|
|
||||||
|
|
||||||
## Our Pledge
|
|
||||||
|
|
||||||
We as members, contributors, and leaders pledge to make participation in our
|
|
||||||
community a harassment-free experience for everyone, regardless of age, body
|
|
||||||
size, visible or invisible disability, ethnicity, sex characteristics, gender
|
|
||||||
identity and expression, level of experience, education, socio-economic status,
|
|
||||||
nationality, personal appearance, race, religion, or sexual identity
|
|
||||||
and orientation.
|
|
||||||
|
|
||||||
We pledge to act and interact in ways that contribute to an open, welcoming,
|
|
||||||
diverse, inclusive, and healthy community.
|
|
||||||
|
|
||||||
## Our Standards
|
|
||||||
|
|
||||||
Examples of behavior that contributes to a positive environment for our
|
|
||||||
community include:
|
|
||||||
|
|
||||||
* Demonstrating empathy and kindness toward other people
|
|
||||||
* Being respectful of differing opinions, viewpoints, and experiences
|
|
||||||
* Giving and gracefully accepting constructive feedback
|
|
||||||
* Accepting responsibility and apologizing to those affected by our mistakes,
|
|
||||||
and learning from the experience
|
|
||||||
* Focusing on what is best not just for us as individuals, but for the
|
|
||||||
overall community
|
|
||||||
|
|
||||||
Examples of unacceptable behavior include:
|
|
||||||
|
|
||||||
* The use of sexualized language or imagery, and sexual attention or
|
|
||||||
advances of any kind
|
|
||||||
* Trolling, insulting or derogatory comments, and personal or political attacks
|
|
||||||
* Public or private harassment
|
|
||||||
* Publishing others' private information, such as a physical or email
|
|
||||||
address, without their explicit permission
|
|
||||||
* Other conduct which could reasonably be considered inappropriate in a
|
|
||||||
professional setting
|
|
||||||
|
|
||||||
## Enforcement Responsibilities
|
|
||||||
|
|
||||||
Community leaders are responsible for clarifying and enforcing our standards of
|
|
||||||
acceptable behavior and will take appropriate and fair corrective action in
|
|
||||||
response to any behavior that they deem inappropriate, threatening, offensive,
|
|
||||||
or harmful.
|
|
||||||
|
|
||||||
Community leaders have the right and responsibility to remove, edit, or reject
|
|
||||||
comments, commits, code, wiki edits, issues, and other contributions that are
|
|
||||||
not aligned to this Code of Conduct, and will communicate reasons for moderation
|
|
||||||
decisions when appropriate.
|
|
||||||
|
|
||||||
## Scope
|
|
||||||
|
|
||||||
This Code of Conduct applies within all community spaces, and also applies when
|
|
||||||
an individual is officially representing the community in public spaces.
|
|
||||||
Examples of representing our community include using an official e-mail address,
|
|
||||||
posting via an official social media account, or acting as an appointed
|
|
||||||
representative at an online or offline event.
|
|
||||||
|
|
||||||
## Enforcement
|
|
||||||
|
|
||||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
|
||||||
reported to the community leaders responsible for enforcement at
|
|
||||||
https://sidweb.nl/cms3/en/contact.
|
|
||||||
All complaints will be reviewed and investigated promptly and fairly.
|
|
||||||
|
|
||||||
All community leaders are obligated to respect the privacy and security of the
|
|
||||||
reporter of any incident.
|
|
||||||
|
|
||||||
## Enforcement Guidelines
|
|
||||||
|
|
||||||
Community leaders will follow these Community Impact Guidelines in determining
|
|
||||||
the consequences for any action they deem in violation of this Code of Conduct:
|
|
||||||
|
|
||||||
### 1. Correction
|
|
||||||
|
|
||||||
**Community Impact**: Use of inappropriate language or other behavior deemed
|
|
||||||
unprofessional or unwelcome in the community.
|
|
||||||
|
|
||||||
**Consequence**: A private, written warning from community leaders, providing
|
|
||||||
clarity around the nature of the violation and an explanation of why the
|
|
||||||
behavior was inappropriate. A public apology may be requested.
|
|
||||||
|
|
||||||
### 2. Warning
|
|
||||||
|
|
||||||
**Community Impact**: A violation through a single incident or series
|
|
||||||
of actions.
|
|
||||||
|
|
||||||
**Consequence**: A warning with consequences for continued behavior. No
|
|
||||||
interaction with the people involved, including unsolicited interaction with
|
|
||||||
those enforcing the Code of Conduct, for a specified period of time. This
|
|
||||||
includes avoiding interactions in community spaces as well as external channels
|
|
||||||
like social media. Violating these terms may lead to a temporary or
|
|
||||||
permanent ban.
|
|
||||||
|
|
||||||
### 3. Temporary Ban
|
|
||||||
|
|
||||||
**Community Impact**: A serious violation of community standards, including
|
|
||||||
sustained inappropriate behavior.
|
|
||||||
|
|
||||||
**Consequence**: A temporary ban from any sort of interaction or public
|
|
||||||
communication with the community for a specified period of time. No public or
|
|
||||||
private interaction with the people involved, including unsolicited interaction
|
|
||||||
with those enforcing the Code of Conduct, is allowed during this period.
|
|
||||||
Violating these terms may lead to a permanent ban.
|
|
||||||
|
|
||||||
### 4. Permanent Ban
|
|
||||||
|
|
||||||
**Community Impact**: Demonstrating a pattern of violation of community
|
|
||||||
standards, including sustained inappropriate behavior, harassment of an
|
|
||||||
individual, or aggression toward or disparagement of classes of individuals.
|
|
||||||
|
|
||||||
**Consequence**: A permanent ban from any sort of public interaction within
|
|
||||||
the community.
|
|
||||||
|
|
||||||
## Attribution
|
|
||||||
|
|
||||||
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
|
|
||||||
version 2.0, available at
|
|
||||||
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
|
|
||||||
|
|
||||||
Community Impact Guidelines were inspired by [Mozilla's code of conduct
|
|
||||||
enforcement ladder](https://github.com/mozilla/diversity).
|
|
||||||
|
|
||||||
[homepage]: https://www.contributor-covenant.org
|
|
||||||
|
|
||||||
For answers to common questions about this code of conduct, see the FAQ at
|
|
||||||
https://www.contributor-covenant.org/faq. Translations are available at
|
|
||||||
https://www.contributor-covenant.org/translations.
|
|
||||||
|
|
||||||
115
CONTRIBUTING.md
115
CONTRIBUTING.md
@ -1,115 +0,0 @@
|
|||||||
<img src="/tools/logo/TASMOTA_FullLogo_Vector.svg" alt="Logo" align="right" height="76"/>
|
|
||||||
|
|
||||||
# Contributing
|
|
||||||
|
|
||||||
**Any contribution helps our team and makes Tasmota better for the entire community!**
|
|
||||||
|
|
||||||
Everybody is welcome and invited to contribute to Tasmota Project by:
|
|
||||||
|
|
||||||
* Testing newly released features and reporting issues.
|
|
||||||
* Providing Pull Requests (Features, Proof of Concepts, Language files or Fixes)
|
|
||||||
* Contributing missing documentation for features and devices in our [documentation](https://tasmota.github.io/docs/Contributing)
|
|
||||||
|
|
||||||
This document describes rules that are in effect for this repository, meant for handling issues by contributors in the issue tracker and PRs.
|
|
||||||
|
|
||||||
## Opening New Issues
|
|
||||||
|
|
||||||
**Issue tracker is NOT a general discussion forum!**
|
|
||||||
1. Opening an issue means that a problem exists in the code and should be addressed by the project contributors.
|
|
||||||
2. When opening an issue, it is required to fill out the presented template. The requested information is important! If the template is ignored or insufficient info about the issue is provided, the issue may be closed.
|
|
||||||
3. Questions of type "How do I..." or "Can you please help me with..." or "Can Tasmota do..." WILL NOT be handled here. Such questions should be directed at a discussion forum or to the Tasmota Support Chat. All issues of this type will be closed with a simple reference to this contributing policy.
|
|
||||||
4. Issues about topics already handled in the documentation will be closed in a similar manner.
|
|
||||||
5. Issues for unmerged PRs will be closed. If there is an issue with a PR, the explanation should be added to the PR itself.
|
|
||||||
6. Issues with accompanied investigation that shows the root of the problem should be given priority.
|
|
||||||
7. Duplicate issues will be closed.
|
|
||||||
|
|
||||||
## Triaging of Issues/PR's
|
|
||||||
|
|
||||||
1. Any contributor to the project can participate in the triaging process, if he/she chooses to do so.
|
|
||||||
2. An issue that needs to be closed, either due to not complying with this policy, or for other reasons, should be closed by a contributor.
|
|
||||||
3. Issues that are accepted should be marked with appropriate labels.
|
|
||||||
4. Issues that could impact functionality for many users should be considered severe.
|
|
||||||
5. Issues caused by the SDK or chip should not be marked severe, as there usually isn’t much to be done. Common sense should be applied when deciding. Such issues should be documented in the Wiki, for reference by users.
|
|
||||||
6. Issues with feature requests should be discussed for viability/desirability.
|
|
||||||
7. Feature requests or changes that are meant to address a very specific/limited use case, especially if at the expense of increased code complexity, may be denied, or may be required to be redesigned, generalized, or simplified.
|
|
||||||
8. Feature requests that are not accompanied by a PR:
|
|
||||||
* could be closed immediately (denied).
|
|
||||||
* could be closed after some predetermined period of time (left as candidate for somebody to pick up).
|
|
||||||
9. In some cases, feedback may be requested from the issue reporter, either as additional info for clarification, additional testing, or other. If no feedback is provided, the issue may be closed by a contributor or after 30 days by the STALE bot.
|
|
||||||
|
|
||||||
## Pull requests
|
|
||||||
|
|
||||||
A Pull Request (PR) is the process where code modifications are managed in GitHub.
|
|
||||||
|
|
||||||
The process is straight-forward.
|
|
||||||
|
|
||||||
- Read [How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/guide/pull-requests.md#best-practices-for-faster-reviews) by Kubernetes (but skip step 0)
|
|
||||||
- Fork the Tasmota Repository [git repository](https://github.com/arendst/Tasmota).
|
|
||||||
- Write/Change the code in your Fork for a new feature, bug fix, new sensor, optimization, etc.
|
|
||||||
- Ensure tests work.
|
|
||||||
- Create a Pull Request against the [**dev**](https://github.com/arendst/Tasmota/tree/dev) branch of Tasmota.
|
|
||||||
|
|
||||||
1. All pull requests must be done against the dev branch.
|
|
||||||
2. Only relevant files should be touched (Also beware if your editor has auto-formatting feature enabled).
|
|
||||||
3. Only one feature/fix should be added per PR.
|
|
||||||
4. If adding a new functionality (new hardware, new library support) not related to an existing component move it to it's own modules (.ino file).
|
|
||||||
5. PRs that don't compile (fail in CI Tests) or cause coding errors will not be merged. Please fix the issue. Same goes for PRs that are raised against older commit in dev - you might need to rebase and resolve conflicts.
|
|
||||||
6. All pull requests should undergo peer review by at least one contributor other than the creator, excepts for the owner.
|
|
||||||
7. All pull requests should consider updates to the documentation.
|
|
||||||
8. Pull requests that address an outstanding issue, particularly an issue deemed to be severe, should be given priority.
|
|
||||||
9. If a PR is accepted, then it should undergo review and updated based on the feedback provided, then merged.
|
|
||||||
10. By submitting a PR, it is needed to use the provided PR template and check all boxes, performing the required tasks and accepting the CLA.
|
|
||||||
11. Pull requests that don't meet the above will be denied and closed.
|
|
||||||
|
|
||||||
--------------------------------------
|
|
||||||
|
|
||||||
## Contributor License Agreement (CLA)
|
|
||||||
|
|
||||||
```
|
|
||||||
By making a contribution to this project, I certify that:
|
|
||||||
|
|
||||||
(a) The contribution was created in whole or in part by me and I
|
|
||||||
have the right to submit it under the GPL-3.0 license; or
|
|
||||||
|
|
||||||
(b) The contribution is based upon previous work that, to the best
|
|
||||||
of my knowledge, is covered under an appropriate open source
|
|
||||||
license and I have the right under that license to submit that
|
|
||||||
work with modifications, whether created in whole or in part
|
|
||||||
by me, under the GPL-3.0 license; or
|
|
||||||
|
|
||||||
(c) The contribution was provided directly to me by some other
|
|
||||||
person who certified (a), (b) or (c) and I have not modified
|
|
||||||
it.
|
|
||||||
|
|
||||||
(d) I understand and agree that this project and the contribution
|
|
||||||
are public and that a record of the contribution (including all
|
|
||||||
personal information I submit with it) is maintained indefinitely
|
|
||||||
and may be redistributed consistent with this project or the open
|
|
||||||
source license(s) involved.
|
|
||||||
```
|
|
||||||
|
|
||||||
This Contributor License Agreement (CLA) was adopted on April 1st, 2019.
|
|
||||||
|
|
||||||
The text of this license is available under the [Creative Commons Attribution-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-sa/3.0/). It is based on the Linux [Developer Certificate Of Origin](http://elinux.org/Developer_Certificate_Of_Origin), but is modified to explicitly use the GPL-3.0 license and not mention sign-off (due to GitHub.com keeps an historial, with your user name, of PRs' commits and all editions on PR's comments).
|
|
||||||
|
|
||||||
To accept the CLA it is required to put a x between [ ] on `[ ] I accept the CLA` in the PR template when submitting it. The [ ] is an opt-in box, so you have to manually accept it.
|
|
||||||
|
|
||||||
**Why a CLA ?**
|
|
||||||
|
|
||||||
_"A Contributor Licence Agreement (CLA) is strongly recommended when accepting third party contributions to an open development project, such as an open source software project. In order to redistribute contributions, it is necessary to ensure that the project has the necessary rights to do so. A Contributor Licence Agreement is a lightweight agreement, signed by the copyright holder, that grants the necessary rights for the contribution to be redistributed as part of the project."_ [OSS Watch](http://oss-watch.ac.uk/resources/cla)
|
|
||||||
|
|
||||||
A CLA is a legal document in which you state _you are entitled to contribute the code/documentation/translation to the project_ you’re contributing to and that _you are willing to have it used in distributions and derivative works_. This means that should there be any kind of legal issue in the future as to the origins and ownership of any particular piece of code, then that project has the necessary forms on file from the contributor(s) saying they were permitted to make this contribution.
|
|
||||||
|
|
||||||
CLA is a safety because it also ensures that once you have provided a contribution, you cannot try to withdraw permission for its use at a later date. People can therefore use that software, confident that they will not be asked to stop using pieces of the code at a later date.
|
|
||||||
|
|
||||||
A __license__ grants "outbound" rights to the user of project.
|
|
||||||
|
|
||||||
A __CLA__ enables a contributor to grant "inbound" rights to a project.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<Other>
|
|
||||||
<A table should be maintained for relating maintainers and components. When triaging, this is essential to figure out if someone in particular should be consulted about specific changes.>
|
|
||||||
<A stable release cadence should be established, e.g.: every month.>
|
|
||||||
44
FIRMWARE.md
44
FIRMWARE.md
@ -1,44 +0,0 @@
|
|||||||

|
|
||||||
|
|
||||||
Alternative firmware for [ESP8266](https://en.wikipedia.org/wiki/ESP8266) based devices with **easy configuration using webUI, OTA updates, automation using timers or rules, expandability and entirely local control over MQTT, HTTP, Serial or KNX**.
|
|
||||||
_Written for PlatformIO with limited support for Arduino IDE._
|
|
||||||
|
|
||||||
[](https://github.com/arendst/Tasmota/releases/latest)
|
|
||||||
[](https://github.com/arendst/Tasmota/releases/latest)
|
|
||||||
[](LICENSE.txt)
|
|
||||||
[](https://discord.gg/Ks2Kzd4)
|
|
||||||
|
|
||||||
If you like **Tasmota**, give it a star, or fork it and contribute!
|
|
||||||
|
|
||||||
[](https://github.com/arendst/Tasmota/stargazers)
|
|
||||||
[](https://github.com/arendst/Tasmota/network)
|
|
||||||
[](https://paypal.me/tasmota)
|
|
||||||
|
|
||||||
See [CHANGELOG.md](https://github.com/arendst/Tasmota/blob/development/tasmota/CHANGELOG.md) for changes since last release.
|
|
||||||
|
|
||||||
## Development
|
|
||||||
|
|
||||||
[](https://github.com/arendst/Tasmota)
|
|
||||||
[](http://ota.tasmota.com/tasmota/)
|
|
||||||
[](https://github.com/arendst/Tasmota/actions?query=workflow%3A%22Tasmota+CI%22)
|
|
||||||
[](https://github.com/arendst/Tasmota/actions?query=workflow%3A%22Tasmota+ESP32+CI%22)
|
|
||||||
[](https://github.com/arendst/Tasmota/actions?query=workflow%3ABuild_firmware)
|
|
||||||
|
|
||||||
|
|
||||||
Unless your Tasmota powered device exhibits a problem or you need to make use of a feature that is not available in the Tasmota version currently installed on your device, leave your device alone - it works so don't make unnecessary changes! If the release version (i.e., the master branch) exhibits unexpected behaviour for your device and configuration, you should upgrade to the latest development version instead to see if your problem is resolved as some bugs in previous releases or development builds may already have been resolved.
|
|
||||||
|
|
||||||
If new commits have been merged and they compile successfuly, new binary files for every variant will be placed here https://github.com/arendst/Tasmota/tree/firmware/firmware (this URL address can NOT be used for OTA updates) It is important to note that these binaries are based on the current development codebase. These commits are tested as much as is possible and are typically quite stable. However, it is infeasible to test on the hundreds of different types of devices with all the available configuration options permitted.
|
|
||||||
|
|
||||||
Note that there is a chance, as with any upgrade, that the device may not function as expected. You must always account for the possibility that you may need to flash the device via the serial programming interface if the OTA upgrade fails. Even with the master release, you should always attempt to test the device or a similar prototype before upgrading a device which is in production or is hard to reach. And, as always, make a backup of the device configuration before beginning any firmware update.
|
|
||||||
|
|
||||||
## Disclaimer
|
|
||||||
|
|
||||||
:warning: **DANGER OF ELECTROCUTION** :warning:
|
|
||||||
|
|
||||||
If your device connects to mains electricity (AC power) there is danger of electrocution if not installed properly. If you don't know how to install it, please call an electrician (***Beware:*** certain countries prohibit installation without a licensed electrician present). Remember: _**SAFETY FIRST**_. It is not worth the risk to yourself, your family and your home if you don't know exactly what you are doing. Never tinker or try to flash a device using the serial programming interface while it is connected to MAINS ELECTRICITY (AC power).
|
|
||||||
|
|
||||||
We don't take any responsibility nor liability for using this software nor for the installation or any tips, advice, videos, etc. given by any member of this site or any related site.
|
|
||||||
|
|
||||||
## Quick Install
|
|
||||||
Download one of the binaries https://github.com/arendst/Tasmota/tree/firmware/firmware and flash it to your hardware [using our installation guide](https://tasmota.github.io/docs/Getting-Started).
|
|
||||||
|
|
||||||
@ -1,90 +0,0 @@
|
|||||||
# I2C devices
|
|
||||||
|
|
||||||
Tasmota supports several I2C devices but to use them they mostly need to be enabled at compile time to solve possible address conflicts.
|
|
||||||
|
|
||||||
Using command ``I2cDriver`` individual drivers can be enabled or disabled at runtime allowing duplicate I2C addresses at compile time. Use the Index from the table below to control I2C drivers like ``I2cDriver10 0`` for disabling BMP support.
|
|
||||||
|
|
||||||
## Supported I2C devices
|
|
||||||
The following table lists the supported I2C devices
|
|
||||||
|
|
||||||
Index | Define | Driver | Device | Address(es) | Description
|
|
||||||
------|---------------------|---------|----------|-------------|-----------------------------------------------
|
|
||||||
1 | USE_PCA9685 | xdrv_15 | PCA9685 | 0x40 - 0x47 | 16-channel 12-bit pwm driver
|
|
||||||
2 | USE_PCF8574 | xdrv_28 | PCF8574 | 0x20 - 0x26 | 8-bit I/O expander
|
|
||||||
2 | USE_PCF8574 | xdrv_28 | PCF8574A | 0x39 - 0x3F | 8-bit I/O expander
|
|
||||||
3 | USE_DISPLAY_LCD | xdsp_01 | | 0x27, 0x3F | LCD display
|
|
||||||
4 | USE_DISPLAY_SSD1306 | xdsp_02 | SSD1306 | 0x3C - 0x3D | Oled display
|
|
||||||
5 | USE_DISPLAY_MATRIX | xdsp_03 | HT16K33 | 0x70 - 0x77 | 8x8 led matrix
|
|
||||||
6 | USE_DISPLAY_SH1106 | xdsp_07 | SH1106 | 0x3C - 0x3D | Oled display
|
|
||||||
7 | USE_ADE7953 | xnrg_07 | ADE7953 | 0x38 | Energy monitor
|
|
||||||
8 | USE_SHT | xsns_07 | SHT1X | Any | Temperature and Humidity sensor
|
|
||||||
9 | USE_HTU | xsns_08 | HTU21 | 0x40 | Temperature and Humidity sensor
|
|
||||||
9 | USE_HTU | xsns_08 | SI7013 | 0x40 | Temperature and Humidity sensor
|
|
||||||
9 | USE_HTU | xsns_08 | SI7020 | 0x40 | Temperature and Humidity sensor
|
|
||||||
9 | USE_HTU | xsns_08 | SI7021 | 0x40 | Temperature and Humidity sensor
|
|
||||||
10 | USE_BMP | xsns_09 | BMP085 | 0x76 - 0x77 | Pressure and temperature sensor
|
|
||||||
10 | USE_BMP | xsns_09 | BMP180 | 0x76 - 0x77 | Pressure and temperature sensor
|
|
||||||
10 | USE_BMP | xsns_09 | BMP280 | 0x76 - 0x77 | Pressure and temperature sensor
|
|
||||||
10 | USE_BMP | xsns_09 | BME280 | 0x76 - 0x77 | Pressure, temperature and humidity sensor
|
|
||||||
10 | USE_BMP | xsns_09 | BME680 | 0x76 - 0x77 | Pressure, temperature, humidity and gas sensor
|
|
||||||
11 | USE_BH1750 | xsns_10 | BH1750 | 0x23, 0x5C | Ambient light intensity sensor
|
|
||||||
12 | USE_VEML6070 | xsns_11 | VEML6070 | 0x38 - 0x39 | Ultra violet light intensity sensor
|
|
||||||
13 | USE_ADS1115 | xsns_12 | ADS1115 | 0x48 - 0x4B | 4-channel 16-bit A/D converter
|
|
||||||
14 | USE_INA219 | xsns_13 | INA219 | 0x40 - 0x41, 0x44 - 0x45 | Low voltage current sensor
|
|
||||||
15 | USE_SHT3X | xsns_14 | SHT3X | 0x44 - 0x45 | Temperature and Humidity sensor
|
|
||||||
15 | USE_SHT3X | xsns_14 | SHTC3 | 0x70 | Temperature and Humidity sensor
|
|
||||||
16 | USE_TSL2561 | xsns_16 | TSL2561 | 0x29, 0x39, 0x49 | Light intensity sensor
|
|
||||||
17 | USE_MGS | xsns_19 | Grove | 0x04 | Multichannel gas sensor
|
|
||||||
18 | USE_SGP30 | xsns_21 | SGP30 | 0x58 | Gas (TVOC) and air quality sensor
|
|
||||||
19 | USE_SI1145 | xsns_24 | SI1145 | 0x60 | Ultra violet index and light sensor
|
|
||||||
19 | USE_SI1145 | xsns_24 | SI1146 | 0x60 | Ultra violet index and light sensor
|
|
||||||
19 | USE_SI1145 | xsns_24 | SI1147 | 0x60 | Ultra violet index and light sensor
|
|
||||||
20 | USE_LM75AD | xsns_26 | LM75AD | 0x48 - 0x4F | Temperature sensor
|
|
||||||
21 | USE_APDS9960 | xsns_27 | APDS9960 | 0x39 | Proximity ambient light RGB and gesture sensor
|
|
||||||
22 | USE_MCP230xx | xsns_29 | MCP23008 | 0x20 - 0x26 | 16-bit I/O expander
|
|
||||||
22 | USE_MCP230xx | xsns_29 | MCP23017 | 0x20 - 0x26 | 16-bit I/O expander
|
|
||||||
23 | USE_MPR121 | xsns_30 | MPR121 | 0x5A - 0x5D | Proximity capacitive touch sensor
|
|
||||||
24 | USE_CCS811 | xsns_31 | CCS811 | 0x5A | Gas (TVOC) and air quality sensor
|
|
||||||
25 | USE_MPU6050 | xsns_32 | MPU6050 | 0x68 - 0x69 | 3-axis gyroscope and temperature sensor
|
|
||||||
26 | USE_DS3231 | xsns_33 | DS3231 | 0x68 | Real time clock
|
|
||||||
27 | USE_MGC3130 | xsns_36 | MGC3130 | 0x42 | Electric field sensor
|
|
||||||
28 | USE_MAX44009 | xsns_41 | MAX44009 | 0x4A - 0x4B | Ambient light intensity sensor
|
|
||||||
29 | USE_SCD30 | xsns_42 | SCD30 | 0x61 | CO2 sensor
|
|
||||||
30 | USE_SPS30 | xsns_44 | SPS30 | 0x69 | Particle sensor
|
|
||||||
31 | USE_VL53L0X | xsns_45 | VL53L0X | 0x29 | Time-of-flight (ToF) distance sensor
|
|
||||||
32 | USE_MLX90614 | xsns_46 | MLX90614 | 0x5A | Infra red temperature sensor
|
|
||||||
33 | USE_CHIRP | xsns_48 | CHIRP | 0x20 | Soil moisture sensor
|
|
||||||
34 | USE_PAJ7620 | xsns_50 | PAJ7620 | 0x73 | Gesture sensor
|
|
||||||
35 | USE_INA226 | xsns_54 | INA226 | 0x40 - 0x41, 0x44 - 0x45 | Low voltage current sensor
|
|
||||||
36 | USE_HIH6 | xsns_55 | HIH6130 | 0x27 | Temperature and Humidity sensor
|
|
||||||
37 | USE_24C256 | xdrv_10 | 24C256 | 0x50 | Scripter EEPROM storage
|
|
||||||
38 | USE_DISPLAY_ILI9488 | xdsp_08 | FT6236 | 0x38 | Touch panel controller
|
|
||||||
39 | USE_DISPLAY_RA8876 | xdsp_10 | FT5316 | 0x38 | Touch panel controller
|
|
||||||
40 | USE_TSL2591 | xsns_57 | TLS2591 | 0x29 | Light intensity sensor
|
|
||||||
41 | USE_DHT12 | xsns_58 | DHT12 | 0x5C | Temperature and humidity sensor
|
|
||||||
42 | USE_DS1624 | xsns_59 | DS1621 | 0x48 - 0x4F | Temperature sensor
|
|
||||||
42 | USE_DS1624 | xsns_59 | DS1624 | 0x48 - 0x4F | Temperature sensor
|
|
||||||
43 | USE_AHT1x | xsns_63 | AHT10/15 | 0x38 - 0x39 | Temperature and humidity sensor
|
|
||||||
43 | USE_AHT2x | xsns_63 | AHT20 | 0x38 | Temperature and humidity sensor
|
|
||||||
44 | USE_WEMOS_MOTOR_V1 | xdrv_34 | | 0x2D - 0x30 | WEMOS motor shield v1.0.0 (6612FNG)
|
|
||||||
45 | USE_HDC1080 | xsns_65 | HDC1080 | 0x40 | Temperature and Humidity sensor
|
|
||||||
46 | USE_IAQ | xsns_66 | IAQ | 0x5a | Air quality sensor
|
|
||||||
47 | USE_DISPLAY_SEVENSEG| xdsp_11 | HT16K33 | 0x70 - 0x77 | Seven segment LED
|
|
||||||
48 | USE_AS3935 | xsns_67 | AS3935 | 0x03 | Franklin Lightning Sensor
|
|
||||||
49 | USE_VEML6075 | xsns_70 | VEML6075 | 0x10 | UVA/UVB/UVINDEX Sensor
|
|
||||||
50 | USE_VEML7700 | xsns_71 | VEML7700 | 0x10 | Ambient light intensity sensor
|
|
||||||
51 | USE_MCP9808 | xsns_72 | MCP9808 | 0x18 - 0x1F | Temperature sensor
|
|
||||||
52 | USE_HP303B | xsns_73 | HP303B | 0x76 - 0x77 | Pressure and temperature sensor
|
|
||||||
53 | USE_MLX90640 | xdrv_84 | MLX90640 | 0x33 | IR array temperature sensor
|
|
||||||
54 | USE_VL53L1X | xsns_77 | VL53L1X | 0x29 | Time-of-flight (ToF) distance sensor
|
|
||||||
55 | USE_EZOPH | xsns_78 | EZOPH | 0x61 - 0x70 | pH sensor
|
|
||||||
55 | USE_EZOORP | xsns_78 | EZOORP | 0x61 - 0x70 | ORP sensor
|
|
||||||
55 | USE_EZORTD | xsns_78 | EZORTD | 0x61 - 0x70 | Temperature sensor
|
|
||||||
55 | USE_EZOHUM | xsns_78 | EZOHUM | 0x61 - 0x70 | Humidity sensor
|
|
||||||
55 | USE_EZOEC | xsns_78 | EZOEC | 0x61 - 0x70 | Electric conductivity sensor
|
|
||||||
55 | USE_EZOCO2 | xsns_78 | EZOCO2 | 0x61 - 0x70 | CO2 sensor
|
|
||||||
55 | USE_EZOO2 | xsns_78 | EZOO2 | 0x61 - 0x70 | O2 sensor
|
|
||||||
55 | USE_EZOPRS | xsns_78 | EZOPRS | 0x61 - 0x70 | Pressure sensor
|
|
||||||
55 | USE_EZOFLO | xsns_78 | EZOFLO | 0x61 - 0x70 | Flow meter sensor
|
|
||||||
55 | USE_EZODO | xsns_78 | EZODO | 0x61 - 0x70 | Disolved Oxygen sensor
|
|
||||||
55 | USE_EZORGB | xsns_78 | EZORGB | 0x61 - 0x70 | Color sensor
|
|
||||||
@ -1,4 +1,6 @@
|
|||||||
Copyright 2017 Felix Galindo
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2026 mgeppert
|
||||||
|
|
||||||
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:
|
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:
|
||||||
|
|
||||||
674
LICENSE.txt
674
LICENSE.txt
@ -1,674 +0,0 @@
|
|||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
the GNU General Public License is intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users. We, the Free Software Foundation, use the
|
|
||||||
GNU General Public License for most of our software; it applies also to
|
|
||||||
any other work released this way by its authors. You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to prevent others from denying you
|
|
||||||
these rights or asking you to surrender the rights. Therefore, you have
|
|
||||||
certain responsibilities if you distribute copies of the software, or if
|
|
||||||
you modify it: responsibilities to respect the freedom of others.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must pass on to the recipients the same
|
|
||||||
freedoms that you received. You must make sure that they, too, receive
|
|
||||||
or can get the source code. And you must show them these terms so they
|
|
||||||
know their rights.
|
|
||||||
|
|
||||||
Developers that use the GNU GPL protect your rights with two steps:
|
|
||||||
(1) assert copyright on the software, and (2) offer you this License
|
|
||||||
giving you legal permission to copy, distribute and/or modify it.
|
|
||||||
|
|
||||||
For the developers' and authors' protection, the GPL clearly explains
|
|
||||||
that there is no warranty for this free software. For both users' and
|
|
||||||
authors' sake, the GPL requires that modified versions be marked as
|
|
||||||
changed, so that their problems will not be attributed erroneously to
|
|
||||||
authors of previous versions.
|
|
||||||
|
|
||||||
Some devices are designed to deny users access to install or run
|
|
||||||
modified versions of the software inside them, although the manufacturer
|
|
||||||
can do so. This is fundamentally incompatible with the aim of
|
|
||||||
protecting users' freedom to change the software. The systematic
|
|
||||||
pattern of such abuse occurs in the area of products for individuals to
|
|
||||||
use, which is precisely where it is most unacceptable. Therefore, we
|
|
||||||
have designed this version of the GPL to prohibit the practice for those
|
|
||||||
products. If such problems arise substantially in other domains, we
|
|
||||||
stand ready to extend this provision to those domains in future versions
|
|
||||||
of the GPL, as needed to protect the freedom of users.
|
|
||||||
|
|
||||||
Finally, every program is threatened constantly by software patents.
|
|
||||||
States should not allow patents to restrict development and use of
|
|
||||||
software on general-purpose computers, but in those that do, we wish to
|
|
||||||
avoid the special danger that patents applied to a free program could
|
|
||||||
make it effectively proprietary. To prevent this, the GPL assures that
|
|
||||||
patents cannot be used to render the program non-free.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. Use with the GNU Affero General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU Affero General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the special requirements of the GNU Affero General Public License,
|
|
||||||
section 13, concerning interaction through a network will apply to the
|
|
||||||
combination as such.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Program specifies that a certain numbered version of the GNU General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU General Public License, you may choose any version ever published
|
|
||||||
by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future
|
|
||||||
versions of the GNU General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
|
||||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
|
||||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
|
||||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
|
||||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
|
||||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
|
||||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
|
||||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
|
||||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
|
||||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
|
||||||
SUCH DAMAGES.
|
|
||||||
|
|
||||||
17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
{one line to give the program's name and a brief idea of what it does.}
|
|
||||||
Copyright (C) {year} {name of author}
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program does terminal interaction, make it output a short
|
|
||||||
notice like this when it starts in an interactive mode:
|
|
||||||
|
|
||||||
{project} Copyright (C) {year} {fullname}
|
|
||||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, your program's commands
|
|
||||||
might be different; for a GUI interface, you would use an "about box".
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or school,
|
|
||||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
|
||||||
For more information on this, and how to apply and follow the GNU GPL, see
|
|
||||||
<http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
The GNU General Public License does not permit incorporating your program
|
|
||||||
into proprietary programs. If your program is a subroutine library, you
|
|
||||||
may consider it more useful to permit linking proprietary applications with
|
|
||||||
the library. If this is what you want to do, use the GNU Lesser General
|
|
||||||
Public License instead of this License. But first, please read
|
|
||||||
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
|
||||||
83
MODULES.md
83
MODULES.md
@ -1,83 +0,0 @@
|
|||||||
## Supported Modules
|
|
||||||
|
|
||||||
The following hardware modules are supported.
|
|
||||||
|
|
||||||
Module | LCode | Description
|
|
||||||
-------------------|-------|-----------------------
|
|
||||||
01 Sonoff Basic | | Sonoff Basic Wifi Smart Switch
|
|
||||||
02 Sonoff RF | | Sonoff RF Wifi Smart Switch with RF (434MHz) receiver
|
|
||||||
03 Sonoff SV | | Sonoff SV Safe Voltage Wifi Smart Switch
|
|
||||||
04 Sonoff TH | | Sonoff TH10/TH16 Wifi Smart Switch with Sensor connection
|
|
||||||
05 Sonoff Dual | x | Sonoff Dual Wifi Smart Switch
|
|
||||||
06 Sonoff Pow | | Sonoff Pow Wifi Smart Switch with Energy Monitoring
|
|
||||||
07 Sonoff 4CH | | Sonoff 4CH 4-gang Wifi Smart Switch
|
|
||||||
08 Sonoff S2X | | Sonoff S20/S26 Wifi Smart Socket
|
|
||||||
09 Slampher | | Sonoff Slampher Wifi Smart Light Bulb Socket with RF (434MHz) receiver
|
|
||||||
10 Sonoff Touch | x | Sonoff Touch Wifi Light Switch
|
|
||||||
11 Sonoff LED | x | Sonoff Led Wifi Led Pack (Retired)
|
|
||||||
12 1 Channel | | 1 Channel Inching/Self Locking Wifi Switch 5V/12V
|
|
||||||
13 4 Channel | x | 4 Channel Inching/Self Locking Wifi Switch (Retired)
|
|
||||||
14 Motor C/AC | x | Motor Clockwise/Antoclockwise Wifi Switch (Retired)
|
|
||||||
15 ElectroDragon | | Electrodragon Wifi IoT Board
|
|
||||||
16 EXS Relay(s) | x | Electronic Experience Store 1 or 2-gang Wifi Module
|
|
||||||
17 WiOn | | WiOn Wifi Smart Socket
|
|
||||||
18 Generic | x | Any ESP8266/ESP8285 device like WeMos and NodeMCU
|
|
||||||
19 Sonoff Dev | | Sonoff Dev Wifi Development Board
|
|
||||||
20 H801 | x | H801 Wifi 5 Channel LED Controller
|
|
||||||
21 Sonoff SC | x | Sonoff SC Wifi Environmental Monitor
|
|
||||||
22 Sonoff BN-SZ | x | Sonoff BN-SZ01 Wifi Ceiling Led (Retired)
|
|
||||||
23 Sonoff 4CH Pro | x | Sonoff 4CH Pro 4-gang Wifi Smart Switch
|
|
||||||
24 Huafan SS | | HuaFan Wifi Smart Socket
|
|
||||||
25 Sonoff Bridge | x | Sonoff RF (434MHz) transceive to Wifi Bridge
|
|
||||||
26 Sonoff B1 | x | Sonoff B1 Wifi RGBWW Led Bulb
|
|
||||||
27 AiLight | x | Ai-Thinker RGBW Led Bulb
|
|
||||||
28 Sonoff T1 1CH | x | Sonoff T1 1-gang Wifi Light Switch
|
|
||||||
29 Sonoff T1 2CH | x | Sonoff T1 2-gang Wifi Light Switch
|
|
||||||
30 Sonoff T1 3CH | x | Sonoff T1 3-gang Wifi Light Switch
|
|
||||||
31 Supla Espablo | | 2-gang Wifi Module
|
|
||||||
32 Witty Cloud | | Witty Cloud ESP8266 Wifi Development Board
|
|
||||||
33 Yunshan Relay | | ESP8266 Wifi Network Relay Module
|
|
||||||
34 MagicHome | | MagicHome, Flux-light and some Arilux LC10 RGB(W) Led Controller
|
|
||||||
35 Luani HVIO | | Luani ESP8266 Wifi I/O Module
|
|
||||||
36 KMC 70011 | | KMC Wifi Smart Socket with Energy Monitoring
|
|
||||||
37 Arilux LC01 | | Arilux AL-LC01 RGB Led Controller
|
|
||||||
38 Arilux LC11 | | Arilux AL-LC11 RGBWW Led Controller
|
|
||||||
39 Sonoff Dual R2 | x | Sonoff Dual R2 Wifi Smart Switch
|
|
||||||
40 Arilux LC06 | | Arilux AL-LC06 RGB(WW) Led Controller
|
|
||||||
41 Sonoff S31 | | Sonoff S31 Wifi Smart Socket with Energy Monitoring
|
|
||||||
42 Zengge WF017 | | Zengge WF017 Wifi RGB(W) Led Controller
|
|
||||||
43 Sonoff Pow R2 | | Sonoff Pow R2 Wifi Smart Switch with Energy Monitoring
|
|
||||||
44 Sonoff iFan02 | x | Sonoff iFan02 Wifi Smart Ceiling Fan with Light
|
|
||||||
45 BlitzWolf SHP | | BlitzWolf BW-SHP2, BW-SHP6, HomeCube SP1, Gosund SP111, Teckin SP22 Wifi Smart Switch with Energy Monitoring
|
|
||||||
46 Shelly 1 | | Shelly 1 Open Source Wifi Relay Module
|
|
||||||
47 Shelly 2 | | Shelly 2 Wifi 2-gang Relay Module with Energy Monitoring
|
|
||||||
48 Xiaomi Philips | x | Xiaomi Philips Wifi WW Led Bulb
|
|
||||||
49 Neo Coolcam | | Neo Coolcam Wifi Smart Socket
|
|
||||||
50 ESP Switch | | ESP Switch 4-gang Wifi Switch with Leds
|
|
||||||
51 OBI Socket | | OBI Wifi Smart Socket
|
|
||||||
52 Teckin | | Teckin SP22 Wifi Smart Switch with Energy Monitoring
|
|
||||||
53 AplicWDP303075 | | Aplic WDP 303075 CSL Wifi Smart Switch with Energy Monitoring
|
|
||||||
54 TuyaMCU | x | Devices with an MCU using Tuya communication protocol for control
|
|
||||||
55 Gosund SP1 v23 | | Gosund SP1 v2.3 Wifi Smart Switch with Energy Monitoring
|
|
||||||
56 ARMTR Dimmer | x | ARMtronix Wifi dimmer for Incandescent Lights and Led
|
|
||||||
57 SK03 Outdoor | x | SK03 Outdoor Wifi Smart Switch with Energy Monitoring
|
|
||||||
58 PS-16-DZ | x | PS-16-DZ Wifi dimmer for Incandescent Lights and Led
|
|
||||||
59 Teckin US | | Teckin SP20 and ZooZee SA102 Wifi Smart Switch with Energy Monitoring
|
|
||||||
60 Manzoku strip | | Manzoku Wifi Smart Power Strip with four Relays
|
|
||||||
61 OBI Socket 2 | | OBI 2 Wifi Smart Socket
|
|
||||||
62 YTF IR Bridge | x | YTF Universal IR Bridge
|
|
||||||
63 Digoo DG-SP202 | | Digoo DG-SP202 Dual Wifi Smart Switch with Energy Monitoring
|
|
||||||
64 KA10 | | Smanergy KA10 Wifi Smart Wall Switch with Energy Monitoring
|
|
||||||
65 Luminea ZX2820 | | Luminea ZX2820 Wifi Smart Switch with Energy Monitoring
|
|
||||||
66 Mi Desk Lamp | | Mi Desk Lamp with rotary switch and Wifi
|
|
||||||
67 SP10 | | Tuya SP10 Wifi Smart Switch with Energy Monitoring
|
|
||||||
68 WAGA CHCZ02MB | | WAGA life CHCZ02MB Wifi Smart Switch with Energy Monitoring
|
|
||||||
69 SYF05 | | Sunyesmart SYF05 RGBWW Wifi Led Bulb
|
|
||||||
70 Sonoff L1 | x | Sonoff L1 light strip
|
|
||||||
71 Sonoff iFan03 | x | Sonoff iFan03 Wifi Smart Ceiling Fan with Light
|
|
||||||
72 EXS Dimmer | x | EXS Wifi Dimmer v4
|
|
||||||
73 PWM Dimmer | x | Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM Dimmer Switches
|
|
||||||
74 Sonoff D1 | x | Sonoff D1 Wifi and RF Dimmer
|
|
||||||
75 Sonoff ZbBridge | x | Sonoff Zigbee bridge
|
|
||||||
|
|
||||||
Over 1650 additional devices are supported using [templates](TEMPLATES.md).
|
|
||||||
164
README.md
164
README.md
@ -1,163 +1,3 @@
|
|||||||

|
# Tasmota
|
||||||
|
|
||||||
Alternative firmware for [ESP8266](https://en.wikipedia.org/wiki/ESP8266) based devices with **easy configuration using webUI, OTA updates, automation using timers or rules, expandability and entirely local control over MQTT, HTTP, Serial or KNX**.
|
Local copy of the https://github.com/arendst/Tasmota#
|
||||||
_Written for PlatformIO with limited support for Arduino IDE._
|
|
||||||
|
|
||||||
[](https://github.com/arendst/Tasmota/releases/latest)
|
|
||||||
[](https://github.com/arendst/Tasmota/releases/latest)
|
|
||||||
[](LICENSE.txt)
|
|
||||||
[](https://discord.gg/Ks2Kzd4)
|
|
||||||
[](https://gitpod.io/#https://github.com/arendst/Tasmota)
|
|
||||||
|
|
||||||
If you like **Tasmota**, give it a star, or fork it and contribute!
|
|
||||||
|
|
||||||
[](https://github.com/arendst/Tasmota/stargazers)
|
|
||||||
[](https://github.com/arendst/Tasmota/network)
|
|
||||||
[](https://paypal.me/tasmota)
|
|
||||||
|
|
||||||
See [RELEASENOTES.md](https://github.com/arendst/Tasmota/blob/master/RELEASENOTES.md) for release information.
|
|
||||||
|
|
||||||
In addition to the [release webpage](https://github.com/arendst/Tasmota/releases/latest) the binaries can also be downloaded from http://ota.tasmota.com/tasmota/release/
|
|
||||||
|
|
||||||
## Development
|
|
||||||
|
|
||||||
[](https://github.com/arendst/Tasmota)
|
|
||||||
[](http://ota.tasmota.com/tasmota/)
|
|
||||||
[](https://github.com/arendst/Tasmota/actions?query=workflow%3A%22Tasmota+CI%22)
|
|
||||||
[](https://github.com/arendst/Tasmota/actions?query=workflow%3A%22Tasmota+ESP32+CI%22)
|
|
||||||
[](https://github.com/arendst/Tasmota/actions?query=workflow%3ABuild_firmware)
|
|
||||||
|
|
||||||
See [CHANGELOG.md](CHANGELOG.md) for detailed change information.
|
|
||||||
|
|
||||||
Unless your Tasmota powered device exhibits a problem or you need to make use of a feature that is not available in the Tasmota version currently installed on your device, leave your device alone - it works so don't make unnecessary changes! If the release version (i.e., the master branch) exhibits unexpected behaviour for your device and configuration, you should upgrade to the latest development version instead to see if your problem is resolved as some bugs in previous releases or development builds may already have been resolved.
|
|
||||||
|
|
||||||
The Tasmota development codebase is checked every 1-2 hours for changes. If new commits have been merged and they compile successfuly, new binary files for every variant will be posted at http://ota.tasmota.com/tasmota/ (this web address can be used for OTA updates too). It is important to note that these binaries are based on the current development codebase. These commits are tested as much as is possible and are typically quite stable. However, it is infeasible to test on the hundreds of different types of devices with all the available configuration options permitted.
|
|
||||||
|
|
||||||
Note that there is a chance, as with any upgrade, that the device may not function as expected. You must always account for the possibility that you may need to flash the device via the serial programming interface if the OTA upgrade fails. Even with the master release, you should always attempt to test the device or a similar prototype before upgrading a device which is in production or is hard to reach. And, as always, make a backup of the device configuration before beginning any firmware update.
|
|
||||||
|
|
||||||
## Disclaimer
|
|
||||||
|
|
||||||
:warning: **DANGER OF ELECTROCUTION** :warning:
|
|
||||||
|
|
||||||
If your device connects to mains electricity (AC power) there is danger of electrocution if not installed properly. If you don't know how to install it, please call an electrician (***Beware:*** certain countries prohibit installation without a licensed electrician present). Remember: _**SAFETY FIRST**_. It is not worth the risk to yourself, your family and your home if you don't know exactly what you are doing. Never tinker or try to flash a device using the serial programming interface while it is connected to MAINS ELECTRICITY (AC power).
|
|
||||||
|
|
||||||
We don't take any responsibility nor liability for using this software nor for the installation or any tips, advice, videos, etc. given by any member of this site or any related site.
|
|
||||||
|
|
||||||
## Note
|
|
||||||
|
|
||||||
Please do not ask to add new devices unless it requires additional code for new features. If the device is not listed as a module, try using [Templates](https://tasmota.github.io/docs/Templates) first. If it is not listed in the [Tasmota Device Templates Repository](http://blakadder.github.io/templates) create your own [Template](https://tasmota.github.io/docs/Templates#creating-your-template).
|
|
||||||
|
|
||||||
## Quick Install
|
|
||||||
Download one of the released binaries from https://github.com/arendst/Tasmota/releases and flash it to your hardware [using our installation guide](https://tasmota.github.io/docs/Getting-Started).
|
|
||||||
|
|
||||||
## Important User Compilation Information
|
|
||||||
If you want to compile Tasmota yourself keep in mind the following:
|
|
||||||
|
|
||||||
- Only Flash Mode **DOUT** is supported. Do not use Flash Mode DIO / QIO / QOUT as it might seem to brick your device.
|
|
||||||
- Tasmota uses a 1M linker script WITHOUT spiffs **1M (no SPIFFS)** for optimal code space.
|
|
||||||
- To make compile time changes to Tasmota use the `user_config_override.h` file. It assures keeping your custom settings when you download and compile a new version. You have to make a copy from the provided `user_config_override_sample.h` file and add your setting overrides.
|
|
||||||
|
|
||||||
## Configuration Information
|
|
||||||
|
|
||||||
Please refer to the installation and configuration articles in our [documentation](https://tasmota.github.io/docs).
|
|
||||||
|
|
||||||
## Migration Information
|
|
||||||
|
|
||||||
See [wiki migration path](https://tasmota.github.io/docs/Upgrading#migration-path) for instructions how to migrate to a major version. Pay attention to the following version breaks due to dynamic settings updates:
|
|
||||||
|
|
||||||
1. Migrate to **Sonoff-Tasmota 3.9.x**
|
|
||||||
2. Migrate to **Sonoff-Tasmota 4.x**
|
|
||||||
3. Migrate to **Sonoff-Tasmota 5.14**
|
|
||||||
4. Migrate to **Sonoff-Tasmota 6.7.1**
|
|
||||||
5. Migrate to **Tasmota 7.2.0**
|
|
||||||
|
|
||||||
--- Major change in parameter storage layout ---
|
|
||||||
|
|
||||||
6. Migrate to **Tasmota 8.1**
|
|
||||||
7. Migrate to **Tasmota 8.5.1**
|
|
||||||
|
|
||||||
--- Major change in internal GPIO function representation ---
|
|
||||||
|
|
||||||
8. Migrate to **Tasmota 9.1**
|
|
||||||
|
|
||||||
While fallback or downgrading is common practice it was never supported due to Settings additions or changes in newer releases. Starting with version **v9.0.0.1** the internal GPIO function representation has changed in such a way that fallback is only possible to the latest GPIO configuration before installing **v9.0.0.1**.
|
|
||||||
|
|
||||||
## Support Information
|
|
||||||
|
|
||||||
<img src="https://user-images.githubusercontent.com/5904370/68332933-e6e5a600-00d7-11ea-885d-50395f7239a1.png" width=150 align="right" />
|
|
||||||
|
|
||||||
For a database of supported devices see [Tasmota Device Templates Repository](https://templates.blakadder.com)
|
|
||||||
|
|
||||||
If you're looking for support on **Tasmota** there are some options available:
|
|
||||||
|
|
||||||
### Documentation
|
|
||||||
|
|
||||||
* [Documentation Site](https://tasmota.github.io/docs): For information on how to flash Tasmota, configure, use and expand it
|
|
||||||
* [FAQ and Troubleshooting](https://tasmota.github.io/docs/FAQ/): For information on common problems and solutions.
|
|
||||||
* [Commands Information](https://tasmota.github.io/docs/Commands): For information on all the commands supported by Tasmota.
|
|
||||||
|
|
||||||
### Support's Community
|
|
||||||
|
|
||||||
* [Tasmota Forum](https://groups.google.com/d/forum/sonoffusers): For usage and discussions.
|
|
||||||
* [Tasmota Support Chat](https://discord.gg/Ks2Kzd4): For support, troubleshooting and general questions. You have better chances to get fast answers from members of the Tasmota Community.
|
|
||||||
* [Search in Issues](https://github.com/arendst/Tasmota/issues): You might find an answer to your question by searching current or closed issues.
|
|
||||||
|
|
||||||
### Developers' Community
|
|
||||||
|
|
||||||
* [Bug Report](https://github.com/arendst/Tasmota/issues/new?template=Bug_report.md): For reporting Bugs of Tasmota Software.
|
|
||||||
* [Feature Request](https://github.com/arendst/Tasmota/issues/new?template=Feature_request.md): For requesting features/functions to Tasmota Software.
|
|
||||||
* [Troubleshooting](https://github.com/arendst/Tasmota/issues/new?template=Custom.md): As a last resort, you can open new *Troubleshooting* issue on GitHub if the solution could not be found using the other channels. Just remember: the more info you provide the more chances you'll have to get an accurate answer.
|
|
||||||
* [Issue a question](https://github.com/arendst/Tasmota/issues/new/choose): As a last resort, you can open a new *Question* issue on GitHub if the answer could not be found using the other channels. Just remember: the more info you provide the more chances you'll have to get an accurate answer.
|
|
||||||
|
|
||||||
## Contribute
|
|
||||||
|
|
||||||
You can contribute to Tasmota by
|
|
||||||
- providing Pull Requests (Features, Proof of Concepts, Language files or Fixes)
|
|
||||||
- testing new released features and report issues
|
|
||||||
- donating to acquire hardware for testing and implementing or out of gratitude
|
|
||||||
- contributing missing [documentation](https://tasmota.github.io/docs) for features and devices
|
|
||||||
|
|
||||||
[](https://paypal.me/tasmota)
|
|
||||||
|
|
||||||
## Credits
|
|
||||||
|
|
||||||
People helping to keep the show on the road:
|
|
||||||
- David Lang providing initial issue resolution and code optimizations
|
|
||||||
- Heiko Krupp for his IRSend, HTU21, SI70xx and Wemo/Hue emulation drivers
|
|
||||||
- Wiktor Schmidt for Travis CI implementation
|
|
||||||
- Thom Dietrich for PlatformIO optimizations
|
|
||||||
- Marinus van den Broek for his EspEasy groundwork
|
|
||||||
- Pete Ba for more user friendly energy monitor calibration
|
|
||||||
- Lobradov providing compile optimization tips
|
|
||||||
- Flexiti for his initial timer implementation
|
|
||||||
- reloxx13 for his [TasmoAdmin](https://github.com/reloxx13/TasmoAdmin) management tool
|
|
||||||
- Joachim Banzhaf for his TSL2561 library and driver
|
|
||||||
- Gijs Noorlander for his MHZ19, SenseAir and updated PubSubClient drivers
|
|
||||||
- Erik Montnemery for his HomeAssistant Discovery concept and many code tuning tips
|
|
||||||
- Federico Leoni for continued HomeAssistant Discovery support
|
|
||||||
- Aidan Mountford for his HSB support
|
|
||||||
- Daniel Ztolnai for his Serial Bridge implementation
|
|
||||||
- Gerhard Mutz for multiple sensor & display drivers, Sunrise/Sunset, and scripting
|
|
||||||
- Nuno Ferreira for his HC-SR04 driver
|
|
||||||
- Adrian Scillato for his (security)fixes and implementing and maintaining KNX
|
|
||||||
- Gennaro Tortone for implementing and maintaining Eastron drivers
|
|
||||||
- Raymond Mouthaan for managing Wemos Wiki information
|
|
||||||
- Norbert Richter for his [decode-config.py](https://github.com/tasmota/decode-config) tool
|
|
||||||
- Andre Thomas for providing [thehackbox](http://thehackbox.org/tasmota/) OTA support and daily development builds
|
|
||||||
- Joel Stein, digiblur and Shantur Rathore for their Tuya research and driver
|
|
||||||
- Frogmore42 for providing many issue answers
|
|
||||||
- Jason2866 for platformio support and providing many issue answers
|
|
||||||
- Blakadder for managing the new document site and providing template management
|
|
||||||
- Stephan Hadinger for refactoring light driver, enhancing HueEmulation and Zigbee support
|
|
||||||
- tmo for designing the official Tasmota logo
|
|
||||||
- Stefan Bode for his Shutter and Deep sleep drivers
|
|
||||||
- Jacek Ziółkowski for his [TDM](https://github.com/jziolkowski/tdm) management tool and [Tasmotizer](https://github.com/tasmota/tasmotizer) flashing tool
|
|
||||||
- Christian Staars for NRF24L01 and HM-10 Bluetooth sensor support
|
|
||||||
- Paul Diem for UDP Group communication support
|
|
||||||
- Jörg Schüler-Maroldt for his initial ESP32 port
|
|
||||||
- Javier Arigita for his thermostat driver
|
|
||||||
- Many more providing Tips, Wips, Pocs, PRs and Donations
|
|
||||||
|
|
||||||
## License
|
|
||||||
|
|
||||||
This program is licensed under GPL-3.0
|
|
||||||
137
RELEASENOTES.md
137
RELEASENOTES.md
@ -1,137 +0,0 @@
|
|||||||
<img src="https://github.com/arendst/Tasmota/blob/master/tools/logo/TASMOTA_FullLogo_Vector.svg" alt="Logo" align="right" height="76"/>
|
|
||||||
|
|
||||||
# RELEASE NOTES
|
|
||||||
|
|
||||||
## Migration Information
|
|
||||||
|
|
||||||
See [migration path](https://tasmota.github.io/docs/Upgrading#migration-path) for instructions how to migrate to a major version. Pay attention to the following version breaks due to dynamic settings updates:
|
|
||||||
|
|
||||||
1. Migrate to **Sonoff-Tasmota 3.9.x**
|
|
||||||
2. Migrate to **Sonoff-Tasmota 4.x**
|
|
||||||
3. Migrate to **Sonoff-Tasmota 5.14**
|
|
||||||
4. Migrate to **Sonoff-Tasmota 6.7.1**
|
|
||||||
5. Migrate to **Tasmota 7.2.0**
|
|
||||||
|
|
||||||
--- Major change in parameter storage layout ---
|
|
||||||
|
|
||||||
6. Migrate to **Tasmota 8.1**
|
|
||||||
7. Migrate to **Tasmota 8.5.1**
|
|
||||||
|
|
||||||
--- Major change in internal GPIO function representation ---
|
|
||||||
|
|
||||||
8. Migrate to **Tasmota 9.1**
|
|
||||||
|
|
||||||
While fallback or downgrading is common practice it was never supported due to Settings additions or changes in newer releases. Starting with release **v9.1.0 Imogen** the internal GPIO function representation has changed in such a way that fallback is only possible to the latest GPIO configuration before installing **v9.1.0**.
|
|
||||||
|
|
||||||
## Supported Core versions
|
|
||||||
|
|
||||||
This release will be supported from ESP8266/Arduino library Core version **2.7.4.5** due to reported security and stability issues on previous Core version. This will also support gzipped binaries.
|
|
||||||
|
|
||||||
Support of Core versions before 2.7.1 has been removed.
|
|
||||||
|
|
||||||
## Support of TLS
|
|
||||||
|
|
||||||
To save resources when TLS is enabled mDNS needs to be disabled. In addition to TLS using fingerprints now also user supplied CA certs and AWS IoT is supported. Read [full documentation](https://tasmota.github.io/docs/AWS-IoT)
|
|
||||||
|
|
||||||
## Initial configuration tools
|
|
||||||
|
|
||||||
For initial configuration this release supports Webserver based **WifiManager** or **Serial** based command interface only. Support for **WPS** and **SmartConfig** has been removed.
|
|
||||||
|
|
||||||
## Provided Binary Downloads
|
|
||||||
|
|
||||||
The following binary downloads have been compiled with ESP8266/Arduino library core version **2.7.4.5**.
|
|
||||||
|
|
||||||
- **tasmota.bin** = The Tasmota version with most drivers. **RECOMMENDED RELEASE BINARY**
|
|
||||||
- **tasmota-BG.bin** to **tasmota-TW.bin** = The Tasmota version in different languages.
|
|
||||||
- **tasmota-lite.bin** = The Lite version without most drivers and sensors.
|
|
||||||
- **tasmota-knx.bin** = The Knx version without some features but adds KNX support.
|
|
||||||
- **tasmota-sensors.bin** = The Sensors version adds more useful sensors.
|
|
||||||
- **tasmota-ir** = The InfraRed Receiver and transmitter version allowing all available protocols provided by library IRremoteESP8266 but without most other features.
|
|
||||||
- **tasmota-display.bin** = The Display version without Energy Monitoring but adds display support.
|
|
||||||
- **tasmota-zbbridge.bin** = The dedicated Sonoff Zigbee Bridge version.
|
|
||||||
- **tasmota-minimal.bin** = The Minimal version allows intermediate OTA uploads to support larger versions and does NOT change any persistent parameter. This version **should NOT be used for initial installation**.
|
|
||||||
|
|
||||||
The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota/release for ESP8266 or http://ota.tasmota.com/tasmota32/release for ESP32. The links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmota.com/tasmota/release/tasmota.bin.gz``
|
|
||||||
|
|
||||||
[List](MODULES.md) of embedded modules.
|
|
||||||
|
|
||||||
[Complete list](BUILDS.md) of available feature and sensors.
|
|
||||||
|
|
||||||
## Changelog v9.1.0 Imogen
|
|
||||||
### Added
|
|
||||||
- Command ``DimmerStep 1..50`` to change default dimmer up and down step of 10% by James Turton (#9733)
|
|
||||||
- Command ``Gpios 255`` to show all possible GPIO configurations
|
|
||||||
- Command ``NoDelay`` for immediate backlog command execution by Erik Montnemery (#9544)
|
|
||||||
- Command ``ShutterChange`` to increment change position (#9594)
|
|
||||||
- Command ``SwitchMode 15`` sending only MQTT message on switch change (#9593)
|
|
||||||
- Command ``SetOption113 1`` to set dimmer low on rotary dial after power off
|
|
||||||
- Command ``SetOption114 1`` to detach Switches from Relays and enable MQTT action state for all the SwitchModes
|
|
||||||
- Command ``SwitchText`` to change JSON switch names by barbudor (#9691)
|
|
||||||
- Zigbee command ``ZbData`` for better support of device specific data
|
|
||||||
- Zigbee command ``ZbOccupancy`` to configure the time-out for PIR
|
|
||||||
- Optional support for Mitsubishi Electric HVAC by David Gwynne (#9237)
|
|
||||||
- Optional support for Orno WE517-Modbus energy meter by Maxime Vincent (#9353)
|
|
||||||
- SDM630 three phase ImportActive Energy display when ``#define SDM630_IMPORT`` is enabled by Janusz Kostorz (#9124)
|
|
||||||
- Optional support for inverted NeoPixelBus data line by enabling ``#define USE_WS2812_INVERTED`` (#8988)
|
|
||||||
- Support for PWM dimmer color/trigger on tap, SO88 led, DGR WITH_LOCAL flag, multi-press and ledmask by Paul Diem (#9474, #9584)
|
|
||||||
- Support for stateful ACs using ``StateMode`` in tasmota-ir.bin by Arik Yavilevich (#9472)
|
|
||||||
- Support for analog buttons indexed within standard button range
|
|
||||||
- Support for Vietnamese language translations by Tâm.NT
|
|
||||||
- Support for timers in case of no-sunset permanent day by cybermaus (#9543)
|
|
||||||
- Support for EZO sensors by Christopher Tremblay
|
|
||||||
- Support for fixed output Hi or Lo GPIO selection
|
|
||||||
- Support for Hass discovery of TuyaMcu and Sonoff Ifan by Federico Leoni (#9727)
|
|
||||||
- TLS in binary tasmota-zbbridge (#9620)
|
|
||||||
- Zigbee reduce battery drain (#9642)
|
|
||||||
- ESP32 support for Wireless-Tag WT32-ETH01 (#9496)
|
|
||||||
- ESP32 MI32 Beacon support, RSSI at TELEPERIOD, refactoring by Christian Baars (#9609)
|
|
||||||
- HM10 Beacon support and refactoring by Christian Baars (#9702)
|
|
||||||
- Initial support for iBeacons (Sensor52) on ESP32 using internal BLE by rvbglas (#9732)
|
|
||||||
|
|
||||||
### Breaking Changed
|
|
||||||
- Redesigned ESP8266 GPIO internal representation in line with ESP32 changing ``Template`` layout too
|
|
||||||
- TLS fingerprint ``#define MQTT_FINGERPRINT`` from string to hexnumbers (#9570)
|
|
||||||
- Command ``Status`` output for disabled status types now returns {"Command":"Error"}
|
|
||||||
- MAX31865 driver to support up to 6 thermocouples selected by ``MX31865 CS`` instead of ``SSPI CS`` (#9103)
|
|
||||||
- When ``SetOption73 1`` JSON result from `{"ACTION":"SINGLE"}` to `{"Button1":{"Action":"SINGLE"}}`
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
- Command ``Gpio17`` replaces command ``Adc``
|
|
||||||
- Command ``Gpios`` replaces command ``Adcs``
|
|
||||||
- New IR Raw compact format (#9444)
|
|
||||||
- A4988 optional microstep pin selection
|
|
||||||
- Pulsetime to allow use for all relays with 8 interleaved so ``Pulsetime1`` is valid for Relay1, Relay9, Relay17 etc. (#9279)
|
|
||||||
- Management of serial baudrate (#9554)
|
|
||||||
- Rotary driver adjusted accordingly if Mi Desk Lamp module is selected (#9399)
|
|
||||||
- Tasmota Arduino Core v2.7.4.5 allowing webpassword over 47 characters (#9687)
|
|
||||||
- Webserver code optimizations (#9580, #9590)
|
|
||||||
- PlatformIO library structure redesigned for compilation speed by Jason2866
|
|
||||||
- Zigbee flash storage refactor adding commands ``ZbProbe``, ``ZbStatus2`` and ``ZbRestore`` (#9641)
|
|
||||||
- Default otaurl in my_user_config.h to http://ota.tasmota.com/tasmota/release/tasmota.bin.gz
|
|
||||||
- IRremoteESP8266 library from v2.7.10 to v2.7.11
|
|
||||||
- NeoPixelBus library from v2.5.0.09 to v2.6.0
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
- Light wakeup Exception 0 (divide by zero) when ``WakeupDuration`` is not initialised (#9466)
|
|
||||||
- Exception 28 due to device group buffer overflow (#9459)
|
|
||||||
- Arilux RF remote detection regression from v8.3.0
|
|
||||||
- Ledlink blink when no network connected regression from v8.3.1.4 (#9292)
|
|
||||||
- TuyaMcu energy display regression from v8.5.0.1 (#9547)
|
|
||||||
- Thermostat sensor status corruption regression from v8.5.0.1 (#9449)
|
|
||||||
- Telegram message decoding error regression from v8.5.0.1
|
|
||||||
- Rule handling of Var or Mem using text regression from v8.5.0.1 (#9540)
|
|
||||||
- Rule handling of JSON ``null`` regression from v8.5.0.1 (#9685)
|
|
||||||
- Rule Break not working as expected when ONCE is enabled (#9245)
|
|
||||||
- Rule expressions using mems corrupts character pool (#9301)
|
|
||||||
- Shutter timing problem due to buffer overflow in calibration matrix (#9458)
|
|
||||||
- Correct Energy period display shortly after midnight by gominoa (#9536)
|
|
||||||
- Tuyamcu dimmers MQTT topic (#9606)
|
|
||||||
- Scripter memory alignment (#9608)
|
|
||||||
- Zigbee battery percentage (#9607)
|
|
||||||
- HassAnyKey anomaly (#9601)
|
|
||||||
|
|
||||||
### Removed
|
|
||||||
- Support for direct upgrade from Tasmota versions before v7.0
|
|
||||||
- Support for downgrade to versions before 9.0 keeping current GPIO configuration
|
|
||||||
- Auto config update for all Friendlynames and Switchtopic from Tasmota versions before v8.0
|
|
||||||
- Auto output selection of decimal or hexadecimal data based on user input. Now only based on ``SetOption17``
|
|
||||||
1816
TEMPLATES.md
1816
TEMPLATES.md
File diff suppressed because it is too large
Load Diff
@ -1,49 +0,0 @@
|
|||||||
<?php
|
|
||||||
// mkdir and chmod arduino folder to 777
|
|
||||||
//
|
|
||||||
//var_dump($_FILES);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* GZIPs a file on disk (appending .gz to the name)
|
|
||||||
*
|
|
||||||
* From http://stackoverflow.com/questions/6073397/how-do-you-create-a-gz-file-using-php
|
|
||||||
* Based on function by Kioob at:
|
|
||||||
* http://www.php.net/manual/en/function.gzwrite.php#34955
|
|
||||||
*
|
|
||||||
* @param string $source Path to file that should be compressed
|
|
||||||
* @param integer $level GZIP compression level (default: 9)
|
|
||||||
* @return string New filename (with .gz appended) if success, or false if operation fails
|
|
||||||
*/
|
|
||||||
function gzCompressFile($source, $level = 9){
|
|
||||||
$dest = $source . '.gz';
|
|
||||||
$mode = 'wb' . $level;
|
|
||||||
$error = false;
|
|
||||||
if ($fp_out = gzopen($dest, $mode)) {
|
|
||||||
if ($fp_in = fopen($source,'rb')) {
|
|
||||||
while (!feof($fp_in))
|
|
||||||
gzwrite($fp_out, fread($fp_in, 1024 * 512));
|
|
||||||
fclose($fp_in);
|
|
||||||
} else {
|
|
||||||
$error = true;
|
|
||||||
}
|
|
||||||
gzclose($fp_out);
|
|
||||||
} else {
|
|
||||||
$error = true;
|
|
||||||
}
|
|
||||||
if ($error)
|
|
||||||
return false;
|
|
||||||
else
|
|
||||||
return $dest;
|
|
||||||
}
|
|
||||||
|
|
||||||
$image = basename($_FILES["file"]["name"]);
|
|
||||||
$target_file = "arduino/".$image;
|
|
||||||
$hostname = $_SERVER['SERVER_NAME'];
|
|
||||||
|
|
||||||
if (move_uploaded_file($_FILES["file"]["tmp_name"], $target_file)) {
|
|
||||||
gzCompressFile($target_file);
|
|
||||||
echo "The files $image and $image.gz have been uploaded to OTA server $hostname. \n";
|
|
||||||
} else {
|
|
||||||
echo "Sorry, there was an error uploading your file $image to OTA server $hostname. \n";
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
@ -1,112 +0,0 @@
|
|||||||
#!/usr/bin/python
|
|
||||||
#
|
|
||||||
# espupload by Theo Arends - 20170103
|
|
||||||
#
|
|
||||||
# Uploads binary file to OTA server
|
|
||||||
#
|
|
||||||
# Execute: espupload -i <Host_IP_address> -p <Host_port> -f <sketch.bin>
|
|
||||||
#
|
|
||||||
# Needs pycurl
|
|
||||||
# - pip install pycurl
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import os
|
|
||||||
import optparse
|
|
||||||
import logging
|
|
||||||
import pycurl
|
|
||||||
|
|
||||||
HOST_ADDR = "domus1"
|
|
||||||
HOST_PORT = 80
|
|
||||||
HOST_URL = "/api/upload-arduino.php"
|
|
||||||
|
|
||||||
def upload(hostAddr, hostPort, filename):
|
|
||||||
url = 'http://%s:%d%s' % (hostAddr, hostPort, HOST_URL)
|
|
||||||
c = pycurl.Curl()
|
|
||||||
c.setopt(c.URL, url)
|
|
||||||
# The "Expect:" is there to suppress "Expect: 100-continue" behaviour that is
|
|
||||||
# the default in libcurl when posting large bodies (and fails on lighttpd).
|
|
||||||
c.setopt(c.HTTPHEADER, ["Expect:"])
|
|
||||||
c.setopt(c.HTTPPOST, [('file', (c.FORM_FILE, filename, )), ])
|
|
||||||
c.perform()
|
|
||||||
c.close()
|
|
||||||
|
|
||||||
def parser():
|
|
||||||
parser = optparse.OptionParser(
|
|
||||||
usage = "%prog [options]",
|
|
||||||
description = "Upload image to over the air Host server for the esp8266 module with OTA support."
|
|
||||||
)
|
|
||||||
|
|
||||||
# destination ip and port
|
|
||||||
group = optparse.OptionGroup(parser, "Destination")
|
|
||||||
group.add_option("-i", "--host_ip",
|
|
||||||
dest = "host_ip",
|
|
||||||
action = "store",
|
|
||||||
help = "Host IP Address.",
|
|
||||||
default = HOST_ADDR
|
|
||||||
)
|
|
||||||
group.add_option("-p", "--host_port",
|
|
||||||
dest = "host_port",
|
|
||||||
type = "int",
|
|
||||||
help = "Host server ota Port. Default 80",
|
|
||||||
default = HOST_PORT
|
|
||||||
)
|
|
||||||
parser.add_option_group(group)
|
|
||||||
|
|
||||||
# image
|
|
||||||
group = optparse.OptionGroup(parser, "Image")
|
|
||||||
group.add_option("-f", "--file",
|
|
||||||
dest = "image",
|
|
||||||
help = "Image file.",
|
|
||||||
metavar="FILE",
|
|
||||||
default = None
|
|
||||||
)
|
|
||||||
parser.add_option_group(group)
|
|
||||||
|
|
||||||
# output group
|
|
||||||
group = optparse.OptionGroup(parser, "Output")
|
|
||||||
group.add_option("-d", "--debug",
|
|
||||||
dest = "debug",
|
|
||||||
help = "Show debug output. And override loglevel with debug.",
|
|
||||||
action = "store_true",
|
|
||||||
default = False
|
|
||||||
)
|
|
||||||
parser.add_option_group(group)
|
|
||||||
|
|
||||||
(options, args) = parser.parse_args()
|
|
||||||
|
|
||||||
return options
|
|
||||||
# end parser
|
|
||||||
|
|
||||||
def main(args):
|
|
||||||
# get options
|
|
||||||
options = parser()
|
|
||||||
|
|
||||||
# adapt log level
|
|
||||||
loglevel = logging.WARNING
|
|
||||||
if (options.debug):
|
|
||||||
loglevel = logging.DEBUG
|
|
||||||
# end if
|
|
||||||
|
|
||||||
# logging
|
|
||||||
logging.basicConfig(level = loglevel, format = '%(asctime)-8s [%(levelname)s]: %(message)s', datefmt = '%H:%M:%S')
|
|
||||||
|
|
||||||
logging.debug("Options: %s", str(options))
|
|
||||||
|
|
||||||
if (not options.host_ip or not options.image):
|
|
||||||
logging.critical("Not enough arguments.")
|
|
||||||
|
|
||||||
return 1
|
|
||||||
# end if
|
|
||||||
|
|
||||||
if not os.path.exists(options.image):
|
|
||||||
logging.critical('Sorry: the file %s does not exist', options.image)
|
|
||||||
|
|
||||||
return 1
|
|
||||||
# end if
|
|
||||||
|
|
||||||
upload(options.host_ip, options.host_port, options.image)
|
|
||||||
# end main
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
sys.exit(main(sys.argv))
|
|
||||||
# end if
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,171 +0,0 @@
|
|||||||
|
|
||||||
# ESP8266 platform
|
|
||||||
# ------------------------------
|
|
||||||
|
|
||||||
# For more info:
|
|
||||||
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5-3rd-party-Hardware-specification
|
|
||||||
|
|
||||||
name=ESP8266 Boards (2.7.1)
|
|
||||||
version=2.7.1
|
|
||||||
|
|
||||||
# These will be removed by the packager script when doing a JSON release
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
runtime.tools.signing={runtime.platform.path}/tools/signing.py
|
|
||||||
runtime.tools.elf2bin={runtime.platform.path}/tools/elf2bin.py
|
|
||||||
runtime.tools.sizes={runtime.platform.path}/tools/sizes.py
|
|
||||||
runtime.tools.makecorever={runtime.platform.path}/tools/makecorever.py
|
|
||||||
runtime.tools.eboot={runtime.platform.path}/bootloaders/eboot/eboot.elf
|
|
||||||
|
|
||||||
compiler.warning_flags=-w
|
|
||||||
compiler.warning_flags.none=-w
|
|
||||||
compiler.warning_flags.default=
|
|
||||||
compiler.warning_flags.more=-Wall
|
|
||||||
compiler.warning_flags.all=-Wall -Wextra
|
|
||||||
|
|
||||||
build.lwip_lib=-llwip_gcc
|
|
||||||
build.lwip_include=lwip/include
|
|
||||||
build.lwip_flags=-DLWIP_OPEN_SRC
|
|
||||||
|
|
||||||
build.vtable_flags=-DVTABLES_IN_FLASH
|
|
||||||
|
|
||||||
build.sslflags=
|
|
||||||
|
|
||||||
build.exception_flags=-fno-exceptions
|
|
||||||
build.stdcpp_lib=-lstdc++
|
|
||||||
build.stdcpp_level=-std=gnu++11
|
|
||||||
|
|
||||||
# build.float=-u _printf_float -u _scanf_float
|
|
||||||
build.float=
|
|
||||||
build.led=
|
|
||||||
|
|
||||||
# default SDK for all boards
|
|
||||||
# (generic board overrides this variable)
|
|
||||||
build.sdk=NONOSDK22x_190703
|
|
||||||
#build.sdk=NONOSDK22x_191024
|
|
||||||
#build.sdk=NONOSDK22x_191105
|
|
||||||
|
|
||||||
compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
|
|
||||||
compiler.sdk.path={runtime.platform.path}/tools/sdk
|
|
||||||
|
|
||||||
compiler.libc.path={runtime.platform.path}/tools/sdk/libc/xtensa-lx106-elf
|
|
||||||
compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/{build.lwip_include}" "-I{compiler.libc.path}/include" "-I{build.path}/core"
|
|
||||||
|
|
||||||
compiler.c.cmd=xtensa-lx106-elf-gcc
|
|
||||||
compiler.c.flags=-c {compiler.warning_flags} -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -std=gnu99 -ffunction-sections -fdata-sections {build.exception_flags} {build.sslflags}
|
|
||||||
|
|
||||||
compiler.S.cmd=xtensa-lx106-elf-gcc
|
|
||||||
compiler.S.flags=-c -g -x assembler-with-cpp -MMD -mlongcalls
|
|
||||||
|
|
||||||
compiler.c.elf.flags=-g {compiler.warning_flags} -Os -nostdlib -Wl,--no-check-sections -u app_entry {build.float} -Wl,-static "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/lib/{build.sdk}" "-L{compiler.sdk.path}/ld" "-L{compiler.libc.path}/lib" "-T{build.flash_ld}" -Wl,--gc-sections -Wl,-wrap,system_restart_local -Wl,-wrap,spi_flash_read
|
|
||||||
|
|
||||||
compiler.c.elf.cmd=xtensa-lx106-elf-gcc
|
|
||||||
compiler.c.elf.libs=-lhal -lphy -lpp -lnet80211 {build.lwip_lib} -lwpa -lcrypto -lmain -lwps -lbearssl -laxtls -lespnow -lsmartconfig -lairkiss -lwpa2 {build.stdcpp_lib} -lm -lc -lgcc
|
|
||||||
|
|
||||||
compiler.cpp.cmd=xtensa-lx106-elf-g++
|
|
||||||
compiler.cpp.flags=-c {compiler.warning_flags} -Os -g -mlongcalls -mtext-section-literals -fno-rtti -falign-functions=4 {build.stdcpp_level} -MMD -ffunction-sections -fdata-sections {build.exception_flags} {build.sslflags}
|
|
||||||
|
|
||||||
compiler.as.cmd=xtensa-lx106-elf-as
|
|
||||||
|
|
||||||
compiler.ar.cmd=xtensa-lx106-elf-ar
|
|
||||||
compiler.ar.flags=cru
|
|
||||||
|
|
||||||
compiler.elf2hex.cmd=esptool
|
|
||||||
compiler.elf2hex.flags=
|
|
||||||
|
|
||||||
compiler.size.cmd=xtensa-lx106-elf-size
|
|
||||||
|
|
||||||
# This can be overriden in boards.txt
|
|
||||||
build.extra_flags=-DESP8266
|
|
||||||
|
|
||||||
# These can be overridden in platform.local.txt
|
|
||||||
compiler.c.extra_flags=
|
|
||||||
compiler.c.elf.extra_flags=
|
|
||||||
compiler.S.extra_flags=
|
|
||||||
compiler.cpp.extra_flags=
|
|
||||||
compiler.ar.extra_flags=
|
|
||||||
compiler.objcopy.eep.extra_flags=
|
|
||||||
compiler.elf2hex.extra_flags=
|
|
||||||
|
|
||||||
## generate file with git version number
|
|
||||||
## needs git
|
|
||||||
recipe.hooks.sketch.prebuild.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.signing}" --mode header --publickey "{build.source.path}/public.key" --out "{build.path}/core/Updater_Signing.h"
|
|
||||||
# This is quite a working hack. This form of prebuild hook, while intuitive, is not explicitly documented.
|
|
||||||
|
|
||||||
|
|
||||||
## Build the app.ld linker file
|
|
||||||
recipe.hooks.linking.prelink.1.pattern="{compiler.path}{compiler.c.cmd}" -CC -E -P {build.vtable_flags} "{runtime.platform.path}/tools/sdk/ld/eagle.app.v6.common.ld.h" -o "{build.path}/local.eagle.app.v6.common.ld"
|
|
||||||
|
|
||||||
## Compile c files
|
|
||||||
recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -D{build.sdk}=1 -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {build.flash_flags} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
|
|
||||||
|
|
||||||
## Compile c++ files
|
|
||||||
recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -D{build.sdk}=1 -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {build.flash_flags} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
|
|
||||||
|
|
||||||
## Compile S files
|
|
||||||
recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -D{build.sdk}=1 -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {build.flash_flags} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
|
|
||||||
|
|
||||||
## Create archives
|
|
||||||
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
|
|
||||||
|
|
||||||
## Combine gc-sections, archives, and objects
|
|
||||||
recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {build.exception_flags} -Wl,-Map "-Wl,{build.path}/{build.project_name}.map" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{archive_file_path}" {compiler.c.elf.libs} -Wl,--end-group "-L{build.path}"
|
|
||||||
|
|
||||||
## Create eeprom
|
|
||||||
recipe.objcopy.eep.pattern=
|
|
||||||
|
|
||||||
## Create hex
|
|
||||||
recipe.objcopy.hex.1.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.elf2bin}" --eboot "{runtime.tools.eboot}" --app "{build.path}/{build.project_name}.elf" --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size {build.flash_size} --path "{runtime.tools.xtensa-lx106-elf-gcc.path}/bin" --out "{build.path}/{build.project_name}.bin"
|
|
||||||
recipe.objcopy.hex.2.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.signing}" --mode sign --privatekey "{build.source.path}/private.key" --bin "{build.path}/{build.project_name}.bin" --out "{build.path}/{build.project_name}.bin.signed" --legacy "{build.path}/{build.project_name}.bin.legacy_sig"
|
|
||||||
recipe.objcopy.hex.3.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.sizes}" --elf "{build.path}/{build.project_name}.elf" --path "{runtime.tools.xtensa-lx106-elf-gcc.path}/bin"
|
|
||||||
|
|
||||||
## Save hex
|
|
||||||
recipe.output.tmp_file={build.project_name}.bin
|
|
||||||
recipe.output.save_file={build.project_name}.{build.variant}.bin
|
|
||||||
|
|
||||||
## Compute size
|
|
||||||
recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
|
|
||||||
recipe.size.regex=^(?:\.irom0\.text|\.text|\.text1|\.data|\.rodata|)\s+([0-9]+).*
|
|
||||||
recipe.size.regex.data=^(?:\.data|\.rodata|\.bss)\s+([0-9]+).*
|
|
||||||
#recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
|
|
||||||
|
|
||||||
# ------------------------------
|
|
||||||
|
|
||||||
tools.esptool.path=
|
|
||||||
# Because the variable expansion doesn't allow one tool to find another, the following lines
|
|
||||||
# will point to "{runtime.platform.path}/tools/python3/python3" in GIT and
|
|
||||||
# "{runtime.tools.python3.path}/python3" for JSON board manager releases.
|
|
||||||
tools.esptool.cmd={runtime.tools.python3.path}/python3
|
|
||||||
tools.esptool.network_cmd={runtime.tools.python3.path}/python3
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
tools.esptool.upload.protocol=esp
|
|
||||||
# esptool.py --trace option is a debug option, not a verbose option
|
|
||||||
tools.esptool.upload.params.verbose=
|
|
||||||
tools.esptool.upload.params.quiet=
|
|
||||||
|
|
||||||
# First, potentially perform an erase or nothing
|
|
||||||
# Next, do the binary upload
|
|
||||||
# Combined in one rule because Arduino doesn't suport upload.1.pattern/upload.3.pattern
|
|
||||||
tools.esptool.upload.pattern="{cmd}" "{runtime.platform.path}/tools/upload.py" --chip esp8266 --port "{serial.port}" --baud "{upload.speed}" "{upload.verbose}" {upload.erase_cmd} {upload.resetmethod} write_flash 0x0 "{build.path}/{build.project_name}.bin"
|
|
||||||
|
|
||||||
tools.esptool.upload.network_pattern="{network_cmd}" "{runtime.platform.path}/tools/espota.py" -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin"
|
|
||||||
|
|
||||||
tools.mkspiffs.cmd=mkspiffs
|
|
||||||
tools.mkspiffs.cmd.windows=mkspiffs.exe
|
|
||||||
tools.mkspiffs.path={runtime.tools.mkspiffs.path}
|
|
||||||
|
|
||||||
tools.mklittlefs.cmd=mklittlefs
|
|
||||||
tools.mklittlefs.cmd.windows=mklittlefs.exe
|
|
||||||
tools.mklittlefs.path={runtime.platform.path}/tools/mklittlefs
|
|
||||||
|
|
||||||
tools.espupload.cmd=python
|
|
||||||
tools.espupload.cmd.windows=python.exe
|
|
||||||
tools.espupload.path={runtime.platform.path}/tools
|
|
||||||
tools.espupload.upload.protocol=espupload
|
|
||||||
tools.espupload.upload.params.verbose=
|
|
||||||
tools.espupload.upload.params.quiet=
|
|
||||||
tools.espupload.upload.pattern="{cmd}" "{path}/espupload.py" -f "{build.path}/{build.project_name}.bin"
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
# Name, Type, SubType, Offset, Size, Flags
|
|
||||||
nvs, data, nvs, 0x9000, 0x5000,
|
|
||||||
otadata, data, ota, 0xe000, 0x2000,
|
|
||||||
app0, app, ota_0, 0x10000, 0x180000,
|
|
||||||
app1, app, ota_1, 0x190000, 0x180000,
|
|
||||||
ffat, data, fat, 0x310000,0x0F0000,
|
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
# Name, Type, SubType, Offset, Size, Flags
|
|
||||||
nvs, data, nvs, 0x9000, 0x5000,
|
|
||||||
otadata, data, ota, 0xe000, 0x2000,
|
|
||||||
app0, app, ota_0, 0x10000, 0x1F0000,
|
|
||||||
app1, app, ota_1, 0x200000, 0x1F0000,
|
|
||||||
ffat, data, fat, 0x3F0000,0xC10000,
|
|
||||||
|
@ -1,8 +0,0 @@
|
|||||||
# ESP-IDF Partition Table
|
|
||||||
# Name, Type, SubType, Offset, Size, Flags
|
|
||||||
nvs,data,nvs,0x9000,20K,
|
|
||||||
otadata,data,ota,0xe000,8K,
|
|
||||||
app0,app,ota_0,0x10000,1984K,
|
|
||||||
app1,app,ota_1,0x200000,1984K,
|
|
||||||
spiffs,data,spiffs,0x3f0000,60K,
|
|
||||||
eeprom,data,nvs,0x3ff000,4K,
|
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
# Name, Type, SubType, Offset, Size, Flags
|
|
||||||
nvs, data, nvs, 0x9000, 0x5000,
|
|
||||||
otadata, data, ota, 0xe000, 0x2000,
|
|
||||||
app0, app, ota_0, 0x10000, 0x1F0000,
|
|
||||||
app1, app, ota_1, 0x200000, 0x1F0000,
|
|
||||||
spiffs, data, spiffs, 0x3F0000,0x10000,
|
|
||||||
|
@ -1 +0,0 @@
|
|||||||
|
|
||||||
@ -1,334 +0,0 @@
|
|||||||
/**************************************************************************//**
|
|
||||||
* \brief EEPROM 24C128 / 24C256 library for Arduino
|
|
||||||
* \author Copyright (C) 2012 Julien Le Sech - www.idreammicro.com
|
|
||||||
* \version 1.0
|
|
||||||
* \date 20120203
|
|
||||||
*
|
|
||||||
* This file is part of the EEPROM 24C128 / 24C256 library for Arduino.
|
|
||||||
*
|
|
||||||
* This library is free software: you can redistribute it and/or modify it under
|
|
||||||
* the terms of the GNU Lesser General Public License as published by the Free
|
|
||||||
* Software Foundation, either version 3 of the License, or (at your option) any
|
|
||||||
* later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
|
|
||||||
* details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with this program. If not, see http://www.gnu.org/licenses/
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \file Eeprom24C128_256.cpp
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
/******************************************************************************
|
|
||||||
* Header file inclusions.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <Arduino.h>
|
|
||||||
#include <Wire.h>
|
|
||||||
|
|
||||||
#include <Eeprom24C128_256.h>
|
|
||||||
|
|
||||||
/******************************************************************************
|
|
||||||
* Private macro definitions.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \def EEPROM__PAGE_SIZE
|
|
||||||
* \brief Size of a page in EEPROM memory.
|
|
||||||
* This size is given by EEPROM memory datasheet.
|
|
||||||
******************************************************************************/
|
|
||||||
#define EEPROM__PAGE_SIZE 64
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \def EEPROM__RD_BUFFER_SIZE
|
|
||||||
* \brief Size of input TWI buffer.
|
|
||||||
* This size is equal to BUFFER_LENGTH defined in Wire library (32 bytes).
|
|
||||||
******************************************************************************/
|
|
||||||
#define xBUFFER_LENGTH 24
|
|
||||||
#define EEPROM__RD_BUFFER_SIZE xBUFFER_LENGTH
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \def EEPROM__WR_BUFFER_SIZE
|
|
||||||
* \brief Size of output TWI buffer.
|
|
||||||
* This size is equal to BUFFER_LENGTH - 2 bytes reserved for address.
|
|
||||||
******************************************************************************/
|
|
||||||
#define EEPROM__WR_BUFFER_SIZE (xBUFFER_LENGTH - 2)
|
|
||||||
|
|
||||||
/******************************************************************************
|
|
||||||
* Public method definitions.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn Eeprom24C128_256::Eeprom24C128_256(byte deviceAddress)
|
|
||||||
*
|
|
||||||
* \brief Constructor.
|
|
||||||
*
|
|
||||||
* \param deviceAddress EEPROM address on TWI bus.
|
|
||||||
******************************************************************************/
|
|
||||||
Eeprom24C128_256::Eeprom24C128_256
|
|
||||||
(
|
|
||||||
byte deviceAddress
|
|
||||||
){
|
|
||||||
m_deviceAddress = deviceAddress;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn void Eeprom24C128_256::initialize()
|
|
||||||
*
|
|
||||||
* \brief Initialize library and TWI bus.
|
|
||||||
*
|
|
||||||
* If several devices are connected to TWI bus, this method mustn't be
|
|
||||||
* called. TWI bus must be initialized out of this library using
|
|
||||||
* Wire.begin() method.
|
|
||||||
******************************************************************************/
|
|
||||||
void
|
|
||||||
Eeprom24C128_256::initialize()
|
|
||||||
{
|
|
||||||
Wire.begin();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn void Eeprom24C128_256::writeByte(
|
|
||||||
* word address,
|
|
||||||
* byte data)
|
|
||||||
*
|
|
||||||
* \brief Write a byte in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \remarks A delay of 10 ms is required after write cycle.
|
|
||||||
*
|
|
||||||
* \param address Address.
|
|
||||||
* \param data Byte to write.
|
|
||||||
******************************************************************************/
|
|
||||||
void
|
|
||||||
Eeprom24C128_256::writeByte
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
byte data
|
|
||||||
){
|
|
||||||
Wire.beginTransmission(m_deviceAddress);
|
|
||||||
Wire.write(address >> 8);
|
|
||||||
Wire.write(address & 0xFF);
|
|
||||||
Wire.write(data);
|
|
||||||
Wire.endTransmission();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn void Eeprom24C128_256::writeBytes(
|
|
||||||
* word address,
|
|
||||||
* word length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Write bytes in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes to write.
|
|
||||||
* \param[in] p_data Bytes to write.
|
|
||||||
******************************************************************************/
|
|
||||||
void
|
|
||||||
Eeprom24C128_256::writeBytes
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
word length,
|
|
||||||
byte* p_data
|
|
||||||
){
|
|
||||||
// Write first page if not aligned.
|
|
||||||
byte notAlignedLength = 0;
|
|
||||||
byte pageOffset = address % EEPROM__PAGE_SIZE;
|
|
||||||
if (pageOffset > 0)
|
|
||||||
{
|
|
||||||
notAlignedLength = EEPROM__PAGE_SIZE - pageOffset;
|
|
||||||
if (length < notAlignedLength)
|
|
||||||
{
|
|
||||||
notAlignedLength = length;
|
|
||||||
}
|
|
||||||
writePage(address, notAlignedLength, p_data);
|
|
||||||
length -= notAlignedLength;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (length > 0)
|
|
||||||
{
|
|
||||||
address += notAlignedLength;
|
|
||||||
p_data += notAlignedLength;
|
|
||||||
|
|
||||||
// Write complete and aligned pages.
|
|
||||||
word pageCount = length / EEPROM__PAGE_SIZE;
|
|
||||||
for (word i = 0; i < pageCount; i++)
|
|
||||||
{
|
|
||||||
writePage(address, EEPROM__PAGE_SIZE, p_data);
|
|
||||||
address += EEPROM__PAGE_SIZE;
|
|
||||||
p_data += EEPROM__PAGE_SIZE;
|
|
||||||
length -= EEPROM__PAGE_SIZE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (length > 0)
|
|
||||||
{
|
|
||||||
// Write remaining uncomplete page.
|
|
||||||
writePage(address, length, p_data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn byte Eeprom24C128_256::readByte(word address)
|
|
||||||
*
|
|
||||||
* \brief Read a byte in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \param address Address.
|
|
||||||
*
|
|
||||||
* \return Read byte.
|
|
||||||
******************************************************************************/
|
|
||||||
byte
|
|
||||||
Eeprom24C128_256::readByte
|
|
||||||
(
|
|
||||||
word address
|
|
||||||
){
|
|
||||||
Wire.beginTransmission(m_deviceAddress);
|
|
||||||
Wire.write(address >> 8);
|
|
||||||
Wire.write(address & 0xFF);
|
|
||||||
Wire.endTransmission();
|
|
||||||
Wire.requestFrom(m_deviceAddress, (byte)1);
|
|
||||||
byte data = 0;
|
|
||||||
if (Wire.available())
|
|
||||||
{
|
|
||||||
data = Wire.read();
|
|
||||||
}
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn void Eeprom24C128_256::readBytes(
|
|
||||||
* word address,
|
|
||||||
* word length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Read bytes in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes to read.
|
|
||||||
* \patam[in] p_data Byte array to fill with read bytes.
|
|
||||||
******************************************************************************/
|
|
||||||
void
|
|
||||||
Eeprom24C128_256::readBytes
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
word length,
|
|
||||||
byte* p_data
|
|
||||||
){
|
|
||||||
byte bufferCount = length / EEPROM__RD_BUFFER_SIZE;
|
|
||||||
for (byte i = 0; i < bufferCount; i++)
|
|
||||||
{
|
|
||||||
word offset = i * EEPROM__RD_BUFFER_SIZE;
|
|
||||||
readBuffer(address + offset, EEPROM__RD_BUFFER_SIZE, p_data + offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
byte remainingBytes = length % EEPROM__RD_BUFFER_SIZE;
|
|
||||||
word offset = length - remainingBytes;
|
|
||||||
readBuffer(address + offset, remainingBytes, p_data + offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
/******************************************************************************
|
|
||||||
* Private method definitions.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn void Eeprom24C128_256::writePage(
|
|
||||||
* word address,
|
|
||||||
* byte length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Write page in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes (EEPROM__PAGE_SIZE bytes max).
|
|
||||||
* \param[in] p_data Data.
|
|
||||||
******************************************************************************/
|
|
||||||
void
|
|
||||||
Eeprom24C128_256::writePage
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
byte length,
|
|
||||||
byte* p_data
|
|
||||||
){
|
|
||||||
// Write complete buffers.
|
|
||||||
byte bufferCount = length / EEPROM__WR_BUFFER_SIZE;
|
|
||||||
for (byte i = 0; i < bufferCount; i++)
|
|
||||||
{
|
|
||||||
byte offset = i * EEPROM__WR_BUFFER_SIZE;
|
|
||||||
writeBuffer(address + offset, EEPROM__WR_BUFFER_SIZE, p_data + offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Write remaining bytes.
|
|
||||||
byte remainingBytes = length % EEPROM__WR_BUFFER_SIZE;
|
|
||||||
byte offset = length - remainingBytes;
|
|
||||||
writeBuffer(address + offset, remainingBytes, p_data + offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn void Eeprom24C128_256::writeBuffer(
|
|
||||||
* word address,
|
|
||||||
* byte length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Write bytes into memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes (EEPROM__WR_BUFFER_SIZE bytes max).
|
|
||||||
* \param[in] p_data Data.
|
|
||||||
******************************************************************************/
|
|
||||||
void
|
|
||||||
Eeprom24C128_256::writeBuffer
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
byte length,
|
|
||||||
byte* p_data
|
|
||||||
){
|
|
||||||
Wire.beginTransmission(m_deviceAddress);
|
|
||||||
Wire.write(address >> 8);
|
|
||||||
Wire.write(address & 0xFF);
|
|
||||||
for (byte i = 0; i < length; i++)
|
|
||||||
{
|
|
||||||
Wire.write(p_data[i]);
|
|
||||||
}
|
|
||||||
Wire.endTransmission();
|
|
||||||
|
|
||||||
// Write cycle time (tWR). See EEPROM memory datasheet for more details.
|
|
||||||
delay(10);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn void Eeprom24C128_256::readBuffer(
|
|
||||||
* word address,
|
|
||||||
* byte length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Read bytes in memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes (EEPROM__RD_BUFFER_SIZE bytes max).
|
|
||||||
* \param[in] p_data Buffer to fill with read bytes.
|
|
||||||
******************************************************************************/
|
|
||||||
void
|
|
||||||
Eeprom24C128_256::readBuffer
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
byte length,
|
|
||||||
byte* p_data
|
|
||||||
){
|
|
||||||
Wire.beginTransmission(m_deviceAddress);
|
|
||||||
Wire.write(address >> 8);
|
|
||||||
Wire.write(address & 0xFF);
|
|
||||||
Wire.endTransmission();
|
|
||||||
Wire.requestFrom(m_deviceAddress, length);
|
|
||||||
for (byte i = 0; i < length; i++)
|
|
||||||
{
|
|
||||||
if (Wire.available())
|
|
||||||
{
|
|
||||||
p_data[i] = Wire.read();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,212 +0,0 @@
|
|||||||
/**************************************************************************//**
|
|
||||||
* \brief EEPROM 24C128 / 24C256 library for Arduino
|
|
||||||
* \author Copyright (C) 2012 Julien Le Sech - www.idreammicro.com
|
|
||||||
* \version 1.0
|
|
||||||
* \date 20120203
|
|
||||||
*
|
|
||||||
* This file is part of the EEPROM 24C128 / 24C256 library for Arduino.
|
|
||||||
*
|
|
||||||
* This library is free software: you can redistribute it and/or modify it under
|
|
||||||
* the terms of the GNU Lesser General Public License as published by the Free
|
|
||||||
* Software Foundation, either version 3 of the License, or (at your option) any
|
|
||||||
* later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
|
|
||||||
* details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with this program. If not, see http://www.gnu.org/licenses/
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \headerfile Eeprom24C128_256.h
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef Eeprom24C128_256_h
|
|
||||||
#define Eeprom24C128_256_h
|
|
||||||
|
|
||||||
/******************************************************************************
|
|
||||||
* Header file inclusion.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <Arduino.h>
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \class Eeprom24C128_256
|
|
||||||
*
|
|
||||||
* \brief EEPROM 24C128 / 24C256 memory driver.
|
|
||||||
*
|
|
||||||
* This driver is mainly designed for 24C128 and 24C256 EEPROM memories. It's
|
|
||||||
* also suitable for 24C512 memories.
|
|
||||||
******************************************************************************/
|
|
||||||
class Eeprom24C128_256
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn Eeprom24C128_256(byte deviceAddress)
|
|
||||||
*
|
|
||||||
* \brief Constructor.
|
|
||||||
*
|
|
||||||
* \param deviceAddress EEPROM address on TWI bus.
|
|
||||||
**********************************************************************/
|
|
||||||
Eeprom24C128_256
|
|
||||||
(
|
|
||||||
byte deviceAddress
|
|
||||||
);
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn void initialize()
|
|
||||||
*
|
|
||||||
* \brief Initialize library abnd TWI bus.
|
|
||||||
*
|
|
||||||
* If several devices are connected to TWI bus, this method mustn't be
|
|
||||||
* called. TWI bus must be initialized out of this library using
|
|
||||||
* Wire.begin() method.
|
|
||||||
**********************************************************************/
|
|
||||||
void
|
|
||||||
initialize();
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn void writeByte(
|
|
||||||
* word address,
|
|
||||||
* byte data)
|
|
||||||
*
|
|
||||||
* \brief Write a byte in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \remarks A delay of 10 ms is required after write cycle.
|
|
||||||
*
|
|
||||||
* \param address Address.
|
|
||||||
* \param data Byte to write.
|
|
||||||
**********************************************************************/
|
|
||||||
void
|
|
||||||
writeByte
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
byte data
|
|
||||||
);
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn void writeBytes(
|
|
||||||
* word address,
|
|
||||||
* word length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Write bytes in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes to write.
|
|
||||||
* \param[in] p_data Bytes to write.
|
|
||||||
**********************************************************************/
|
|
||||||
void
|
|
||||||
writeBytes
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
word length,
|
|
||||||
byte* p_data
|
|
||||||
);
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn byte readByte(word address)
|
|
||||||
*
|
|
||||||
* \brief Read a byte in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \param address Address.
|
|
||||||
*
|
|
||||||
* \return Read byte.
|
|
||||||
**********************************************************************/
|
|
||||||
byte
|
|
||||||
readByte
|
|
||||||
(
|
|
||||||
word address
|
|
||||||
);
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn void readBytes(
|
|
||||||
* word address,
|
|
||||||
* word length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Read bytes in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes to read.
|
|
||||||
* \patam[in] p_data Byte array to fill with read bytes.
|
|
||||||
**********************************************************************/
|
|
||||||
void
|
|
||||||
readBytes
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
word length,
|
|
||||||
byte* p_buffer
|
|
||||||
);
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
byte m_deviceAddress;
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn void writePage(
|
|
||||||
* word address,
|
|
||||||
* byte length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Write page in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes (64 bytes max).
|
|
||||||
* \param[in] p_data Data.
|
|
||||||
**********************************************************************/
|
|
||||||
void
|
|
||||||
writePage
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
byte length,
|
|
||||||
byte* p_data
|
|
||||||
);
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn void writeBuffer(
|
|
||||||
* word address,
|
|
||||||
* byte length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Write bytes into memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes (30 bytes max).
|
|
||||||
* \param[in] p_date Data.
|
|
||||||
**********************************************************************/
|
|
||||||
void
|
|
||||||
writeBuffer
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
byte length,
|
|
||||||
byte* p_data
|
|
||||||
);
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn void readBuffer(
|
|
||||||
* word address,
|
|
||||||
* byte length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Read bytes in memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes to read (32 bytes max).
|
|
||||||
* \param[in] p_data Buffer to fill with read bytes.
|
|
||||||
**********************************************************************/
|
|
||||||
void
|
|
||||||
readBuffer
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
byte length,
|
|
||||||
byte* p_data
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // Eeprom24C128_256_h
|
|
||||||
|
|
||||||
@ -1,334 +0,0 @@
|
|||||||
/**************************************************************************//**
|
|
||||||
* \brief EEPROM 24C512 library for Arduino
|
|
||||||
* \author Copyright (C) 2012 Julien Le Sech - www.idreammicro.com
|
|
||||||
* \version 1.0
|
|
||||||
* \date 20120218
|
|
||||||
*
|
|
||||||
* This file is part of the EEPROM 24C512 library for Arduino.
|
|
||||||
*
|
|
||||||
* This library is free software: you can redistribute it and/or modify it under
|
|
||||||
* the terms of the GNU Lesser General Public License as published by the Free
|
|
||||||
* Software Foundation, either version 3 of the License, or (at your option) any
|
|
||||||
* later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
|
|
||||||
* details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with this program. If not, see http://www.gnu.org/licenses/
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \file Eeprom24C512.cpp
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
/******************************************************************************
|
|
||||||
* Header file inclusions.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <Arduino.h>
|
|
||||||
#include <Wire.h>
|
|
||||||
|
|
||||||
#include <Eeprom24C512.h>
|
|
||||||
|
|
||||||
/******************************************************************************
|
|
||||||
* Private macro definitions.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \def EEPROM__PAGE_SIZE
|
|
||||||
* \brief Size of a page in EEPROM memory.
|
|
||||||
* This size is given by EEPROM memory datasheet.
|
|
||||||
******************************************************************************/
|
|
||||||
#define EEPROM__PAGE_SIZE 128
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \def EEPROM__RD_BUFFER_SIZE
|
|
||||||
* \brief Size of input TWI buffer.
|
|
||||||
* This size is equal to BUFFER_LENGTH defined in Wire library (32 bytes).
|
|
||||||
******************************************************************************/
|
|
||||||
#define EEPROM__RD_BUFFER_SIZE BUFFER_LENGTH
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \def EEPROM__WR_BUFFER_SIZE
|
|
||||||
* \brief Size of output TWI buffer.
|
|
||||||
* This size is equal to BUFFER_LENGTH - 2 bytes reserved for address.
|
|
||||||
******************************************************************************/
|
|
||||||
#define EEPROM__WR_BUFFER_SIZE (BUFFER_LENGTH - 2)
|
|
||||||
|
|
||||||
/******************************************************************************
|
|
||||||
* Public method definitions.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn Eeprom24C512::Eeprom24C512(byte deviceAddress)
|
|
||||||
*
|
|
||||||
* \brief Constructor.
|
|
||||||
*
|
|
||||||
* \param deviceAddress EEPROM address on TWI bus.
|
|
||||||
******************************************************************************/
|
|
||||||
Eeprom24C512::Eeprom24C512
|
|
||||||
(
|
|
||||||
byte deviceAddress
|
|
||||||
){
|
|
||||||
m_deviceAddress = deviceAddress;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn void Eeprom24C512::initialize()
|
|
||||||
*
|
|
||||||
* \brief Initialize library and TWI bus.
|
|
||||||
*
|
|
||||||
* If several devices are connected to TWI bus, this method mustn't be
|
|
||||||
* called. TWI bus must be initialized out of this library using
|
|
||||||
* Wire.begin() method.
|
|
||||||
******************************************************************************/
|
|
||||||
void
|
|
||||||
Eeprom24C512::initialize()
|
|
||||||
{
|
|
||||||
Wire.begin();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn void Eeprom24C512::writeByte(
|
|
||||||
* word address,
|
|
||||||
* byte data)
|
|
||||||
*
|
|
||||||
* \brief Write a byte in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \remarks A delay of 10 ms is required after write cycle.
|
|
||||||
*
|
|
||||||
* \param address Address.
|
|
||||||
* \param data Byte to write.
|
|
||||||
******************************************************************************/
|
|
||||||
void
|
|
||||||
Eeprom24C512::writeByte
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
byte data
|
|
||||||
){
|
|
||||||
Wire.beginTransmission(m_deviceAddress);
|
|
||||||
Wire.write(address >> 8);
|
|
||||||
Wire.write(address & 0xFF);
|
|
||||||
Wire.write(data);
|
|
||||||
Wire.endTransmission();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn void Eeprom24C512::writeBytes(
|
|
||||||
* word address,
|
|
||||||
* word length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Write bytes in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes to write.
|
|
||||||
* \param[in] p_data Bytes to write.
|
|
||||||
******************************************************************************/
|
|
||||||
void
|
|
||||||
Eeprom24C512::writeBytes
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
word length,
|
|
||||||
byte* p_data
|
|
||||||
){
|
|
||||||
// Write first page if not aligned.
|
|
||||||
byte notAlignedLength = 0;
|
|
||||||
byte pageOffset = address % EEPROM__PAGE_SIZE;
|
|
||||||
if (pageOffset > 0)
|
|
||||||
{
|
|
||||||
notAlignedLength = EEPROM__PAGE_SIZE - pageOffset;
|
|
||||||
if (length < notAlignedLength)
|
|
||||||
{
|
|
||||||
notAlignedLength = length;
|
|
||||||
}
|
|
||||||
writePage(address, notAlignedLength, p_data);
|
|
||||||
length -= notAlignedLength;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (length > 0)
|
|
||||||
{
|
|
||||||
address += notAlignedLength;
|
|
||||||
p_data += notAlignedLength;
|
|
||||||
|
|
||||||
// Write complete and aligned pages.
|
|
||||||
word pageCount = length / EEPROM__PAGE_SIZE;
|
|
||||||
for (word i = 0; i < pageCount; i++)
|
|
||||||
{
|
|
||||||
writePage(address, EEPROM__PAGE_SIZE, p_data);
|
|
||||||
address += EEPROM__PAGE_SIZE;
|
|
||||||
p_data += EEPROM__PAGE_SIZE;
|
|
||||||
length -= EEPROM__PAGE_SIZE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (length > 0)
|
|
||||||
{
|
|
||||||
// Write remaining uncomplete page.
|
|
||||||
writePage(address, length, p_data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn byte Eeprom24C512::readByte(word address)
|
|
||||||
*
|
|
||||||
* \brief Read a byte in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \param address Address.
|
|
||||||
*
|
|
||||||
* \return Read byte.
|
|
||||||
******************************************************************************/
|
|
||||||
byte
|
|
||||||
Eeprom24C512::readByte
|
|
||||||
(
|
|
||||||
word address
|
|
||||||
){
|
|
||||||
Wire.beginTransmission(m_deviceAddress);
|
|
||||||
Wire.write(address >> 8);
|
|
||||||
Wire.write(address & 0xFF);
|
|
||||||
Wire.endTransmission();
|
|
||||||
Wire.requestFrom(m_deviceAddress, (byte)1);
|
|
||||||
byte data = 0;
|
|
||||||
if (Wire.available())
|
|
||||||
{
|
|
||||||
data = Wire.read();
|
|
||||||
}
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn void Eeprom24C512::readBytes(
|
|
||||||
* word address,
|
|
||||||
* word length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Read bytes in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes to read.
|
|
||||||
* \patam[in] p_data Byte array to fill with read bytes.
|
|
||||||
******************************************************************************/
|
|
||||||
void
|
|
||||||
Eeprom24C512::readBytes
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
word length,
|
|
||||||
byte* p_data
|
|
||||||
){
|
|
||||||
word bufferCount = length / EEPROM__RD_BUFFER_SIZE;
|
|
||||||
for (word i = 0; i < bufferCount; i++)
|
|
||||||
{
|
|
||||||
word offset = i * EEPROM__RD_BUFFER_SIZE;
|
|
||||||
readBuffer(address + offset, EEPROM__RD_BUFFER_SIZE, p_data + offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
byte remainingBytes = length % EEPROM__RD_BUFFER_SIZE;
|
|
||||||
word offset = length - remainingBytes;
|
|
||||||
readBuffer(address + offset, remainingBytes, p_data + offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
/******************************************************************************
|
|
||||||
* Private method definitions.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn void Eeprom24C512::writePage(
|
|
||||||
* word address,
|
|
||||||
* byte length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Write page in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes (EEPROM__PAGE_SIZE bytes max).
|
|
||||||
* \param[in] p_data Data.
|
|
||||||
******************************************************************************/
|
|
||||||
void
|
|
||||||
Eeprom24C512::writePage
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
byte length,
|
|
||||||
byte* p_data
|
|
||||||
){
|
|
||||||
// Write complete buffers.
|
|
||||||
byte bufferCount = length / EEPROM__WR_BUFFER_SIZE;
|
|
||||||
for (byte i = 0; i < bufferCount; i++)
|
|
||||||
{
|
|
||||||
byte offset = i * EEPROM__WR_BUFFER_SIZE;
|
|
||||||
writeBuffer(address + offset, EEPROM__WR_BUFFER_SIZE, p_data + offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Write remaining bytes.
|
|
||||||
byte remainingBytes = length % EEPROM__WR_BUFFER_SIZE;
|
|
||||||
byte offset = length - remainingBytes;
|
|
||||||
writeBuffer(address + offset, remainingBytes, p_data + offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn void Eeprom24C512::writeBuffer(
|
|
||||||
* word address,
|
|
||||||
* byte length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Write bytes into memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes (EEPROM__WR_BUFFER_SIZE bytes max).
|
|
||||||
* \param[in] p_data Data.
|
|
||||||
******************************************************************************/
|
|
||||||
void
|
|
||||||
Eeprom24C512::writeBuffer
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
byte length,
|
|
||||||
byte* p_data
|
|
||||||
){
|
|
||||||
Wire.beginTransmission(m_deviceAddress);
|
|
||||||
Wire.write(address >> 8);
|
|
||||||
Wire.write(address & 0xFF);
|
|
||||||
for (byte i = 0; i < length; i++)
|
|
||||||
{
|
|
||||||
Wire.write(p_data[i]);
|
|
||||||
}
|
|
||||||
Wire.endTransmission();
|
|
||||||
|
|
||||||
// Write cycle time (tWR). See EEPROM memory datasheet for more details.
|
|
||||||
delay(10);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \fn void Eeprom24C512::readBuffer(
|
|
||||||
* word address,
|
|
||||||
* byte length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Read bytes in memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes (EEPROM__RD_BUFFER_SIZE bytes max).
|
|
||||||
* \param[in] p_data Buffer to fill with read bytes.
|
|
||||||
******************************************************************************/
|
|
||||||
void
|
|
||||||
Eeprom24C512::readBuffer
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
byte length,
|
|
||||||
byte* p_data
|
|
||||||
){
|
|
||||||
Wire.beginTransmission(m_deviceAddress);
|
|
||||||
Wire.write(address >> 8);
|
|
||||||
Wire.write(address & 0xFF);
|
|
||||||
Wire.endTransmission();
|
|
||||||
Wire.requestFrom(m_deviceAddress, length);
|
|
||||||
for (byte i = 0; i < length; i++)
|
|
||||||
{
|
|
||||||
if (Wire.available())
|
|
||||||
{
|
|
||||||
p_data[i] = Wire.read();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,211 +0,0 @@
|
|||||||
/**************************************************************************//**
|
|
||||||
* \brief EEPROM 24C512 library for Arduino
|
|
||||||
* \author Copyright (C) 2012 Julien Le Sech - www.idreammicro.com
|
|
||||||
* \version 1.0
|
|
||||||
* \date 20120203
|
|
||||||
*
|
|
||||||
* This file is part of the EEPROM 24C512 library for Arduino.
|
|
||||||
*
|
|
||||||
* This library is free software: you can redistribute it and/or modify it under
|
|
||||||
* the terms of the GNU Lesser General Public License as published by the Free
|
|
||||||
* Software Foundation, either version 3 of the License, or (at your option) any
|
|
||||||
* later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
|
|
||||||
* details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with this program. If not, see http://www.gnu.org/licenses/
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \headerfile Eeprom24C512.h
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef Eeprom24C512_h
|
|
||||||
#define Eeprom24C512_h
|
|
||||||
|
|
||||||
/******************************************************************************
|
|
||||||
* Header file inclusion.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <Arduino.h>
|
|
||||||
|
|
||||||
/**************************************************************************//**
|
|
||||||
* \class Eeprom24C512
|
|
||||||
*
|
|
||||||
* \brief EEPROM 24C512 memory driver.
|
|
||||||
*
|
|
||||||
* This driver is designed for 24C512 memory.
|
|
||||||
******************************************************************************/
|
|
||||||
class Eeprom24C512
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn Eeprom24C512(byte deviceAddress)
|
|
||||||
*
|
|
||||||
* \brief Constructor.
|
|
||||||
*
|
|
||||||
* \param deviceAddress EEPROM address on TWI bus.
|
|
||||||
**********************************************************************/
|
|
||||||
Eeprom24C512
|
|
||||||
(
|
|
||||||
byte deviceAddress
|
|
||||||
);
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn void initialize()
|
|
||||||
*
|
|
||||||
* \brief Initialize library abnd TWI bus.
|
|
||||||
*
|
|
||||||
* If several devices are connected to TWI bus, this method mustn't be
|
|
||||||
* called. TWI bus must be initialized out of this library using
|
|
||||||
* Wire.begin() method.
|
|
||||||
**********************************************************************/
|
|
||||||
void
|
|
||||||
initialize();
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn void writeByte(
|
|
||||||
* word address,
|
|
||||||
* byte data)
|
|
||||||
*
|
|
||||||
* \brief Write a byte in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \remarks A delay of 10 ms is required after write cycle.
|
|
||||||
*
|
|
||||||
* \param address Address.
|
|
||||||
* \param data Byte to write.
|
|
||||||
**********************************************************************/
|
|
||||||
void
|
|
||||||
writeByte
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
byte data
|
|
||||||
);
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn void writeBytes(
|
|
||||||
* word address,
|
|
||||||
* word length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Write bytes in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes to write.
|
|
||||||
* \param[in] p_data Bytes to write.
|
|
||||||
**********************************************************************/
|
|
||||||
void
|
|
||||||
writeBytes
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
word length,
|
|
||||||
byte* p_data
|
|
||||||
);
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn byte readByte(word address)
|
|
||||||
*
|
|
||||||
* \brief Read a byte in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \param address Address.
|
|
||||||
*
|
|
||||||
* \return Read byte.
|
|
||||||
**********************************************************************/
|
|
||||||
byte
|
|
||||||
readByte
|
|
||||||
(
|
|
||||||
word address
|
|
||||||
);
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn void readBytes(
|
|
||||||
* word address,
|
|
||||||
* word length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Read bytes in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes to read.
|
|
||||||
* \patam[in] p_data Byte array to fill with read bytes.
|
|
||||||
**********************************************************************/
|
|
||||||
void
|
|
||||||
readBytes
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
word length,
|
|
||||||
byte* p_buffer
|
|
||||||
);
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
byte m_deviceAddress;
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn void writePage(
|
|
||||||
* word address,
|
|
||||||
* byte length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Write page in EEPROM memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes (64 bytes max).
|
|
||||||
* \param[in] p_data Data.
|
|
||||||
**********************************************************************/
|
|
||||||
void
|
|
||||||
writePage
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
byte length,
|
|
||||||
byte* p_data
|
|
||||||
);
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn void writeBuffer(
|
|
||||||
* word address,
|
|
||||||
* byte length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Write bytes into memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes (30 bytes max).
|
|
||||||
* \param[in] p_date Data.
|
|
||||||
**********************************************************************/
|
|
||||||
void
|
|
||||||
writeBuffer
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
byte length,
|
|
||||||
byte* p_data
|
|
||||||
);
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
* \fn void readBuffer(
|
|
||||||
* word address,
|
|
||||||
* byte length,
|
|
||||||
* byte* p_data)
|
|
||||||
*
|
|
||||||
* \brief Read bytes in memory.
|
|
||||||
*
|
|
||||||
* \param address Start address.
|
|
||||||
* \param length Number of bytes to read (32 bytes max).
|
|
||||||
* \param[in] p_data Buffer to fill with read bytes.
|
|
||||||
**********************************************************************/
|
|
||||||
void
|
|
||||||
readBuffer
|
|
||||||
(
|
|
||||||
word address,
|
|
||||||
byte length,
|
|
||||||
byte* p_data
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // Eeprom24C512_h
|
|
||||||
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
name=EEPROM 24C128_256_521
|
|
||||||
version=
|
|
||||||
author=Julien Le Sech
|
|
||||||
maintainer=Julien Le Sech - www.idreammicro.com
|
|
||||||
sentence=EEPROM 24C128 / 24C256 / 24C512 memory driver.
|
|
||||||
paragraph=EEPROM 24C128 / 24C256 / 24C512 memory driver.
|
|
||||||
category=
|
|
||||||
url=
|
|
||||||
architectures=*
|
|
||||||
@ -1 +0,0 @@
|
|||||||
tests/bin
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
sudo: false
|
|
||||||
language: cpp
|
|
||||||
compiler:
|
|
||||||
- g++
|
|
||||||
script: cd tests && make && make test
|
|
||||||
os:
|
|
||||||
- linux
|
|
||||||
@ -1,76 +0,0 @@
|
|||||||
2.7
|
|
||||||
* Fix remaining-length handling to prevent buffer overrun
|
|
||||||
* Add large-payload API - beginPublish/write/publish/endPublish
|
|
||||||
* Add yield call to improve reliability on ESP
|
|
||||||
* Add Clean Session flag to connect options
|
|
||||||
* Add ESP32 support for functional callback signature
|
|
||||||
* Various other fixes
|
|
||||||
|
|
||||||
2.4
|
|
||||||
* Add MQTT_SOCKET_TIMEOUT to prevent it blocking indefinitely
|
|
||||||
whilst waiting for inbound data
|
|
||||||
* Fixed return code when publishing >256 bytes
|
|
||||||
|
|
||||||
2.3
|
|
||||||
* Add publish(topic,payload,retained) function
|
|
||||||
|
|
||||||
2.2
|
|
||||||
* Change code layout to match Arduino Library reqs
|
|
||||||
|
|
||||||
2.1
|
|
||||||
* Add MAX_TRANSFER_SIZE def to chunk messages if needed
|
|
||||||
* Reject topic/payloads that exceed MQTT_MAX_PACKET_SIZE
|
|
||||||
|
|
||||||
2.0
|
|
||||||
* Add (and default to) MQTT 3.1.1 support
|
|
||||||
* Fix PROGMEM handling for Intel Galileo/ESP8266
|
|
||||||
* Add overloaded constructors for convenience
|
|
||||||
* Add chainable setters for server/callback/client/stream
|
|
||||||
* Add state function to return connack return code
|
|
||||||
|
|
||||||
1.9
|
|
||||||
* Do not split MQTT packets over multiple calls to _client->write()
|
|
||||||
* API change: All constructors now require an instance of Client
|
|
||||||
to be passed in.
|
|
||||||
* Fixed example to match 1.8 api changes - dpslwk
|
|
||||||
* Added username/password support - WilHall
|
|
||||||
* Added publish_P - publishes messages from PROGMEM - jobytaffey
|
|
||||||
|
|
||||||
1.8
|
|
||||||
* KeepAlive interval is configurable in PubSubClient.h
|
|
||||||
* Maximum packet size is configurable in PubSubClient.h
|
|
||||||
* API change: Return boolean rather than int from various functions
|
|
||||||
* API change: Length parameter in message callback changed
|
|
||||||
from int to unsigned int
|
|
||||||
* Various internal tidy-ups around types
|
|
||||||
1.7
|
|
||||||
* Improved keepalive handling
|
|
||||||
* Updated to the Arduino-1.0 API
|
|
||||||
1.6
|
|
||||||
* Added the ability to publish a retained message
|
|
||||||
|
|
||||||
1.5
|
|
||||||
* Added default constructor
|
|
||||||
* Fixed compile error when used with arduino-0021 or later
|
|
||||||
|
|
||||||
1.4
|
|
||||||
* Fixed connection lost handling
|
|
||||||
|
|
||||||
1.3
|
|
||||||
* Fixed packet reading bug in PubSubClient.readPacket
|
|
||||||
|
|
||||||
1.2
|
|
||||||
* Fixed compile error when used with arduino-0016 or later
|
|
||||||
|
|
||||||
|
|
||||||
1.1
|
|
||||||
* Reduced size of library
|
|
||||||
* Added support for Will messages
|
|
||||||
* Clarified licensing - see LICENSE.txt
|
|
||||||
|
|
||||||
|
|
||||||
1.0
|
|
||||||
* Only Quality of Service (QOS) 0 messaging is supported
|
|
||||||
* The maximum message size, including header, is 128 bytes
|
|
||||||
* The keepalive interval is set to 30 seconds
|
|
||||||
* No support for Will messages
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
Copyright (c) 2008-2015 Nicholas O'Leary
|
|
||||||
|
|
||||||
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.
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
# Arduino Client for MQTT
|
|
||||||
|
|
||||||
This library provides a client for doing simple publish/subscribe messaging with
|
|
||||||
a server that supports MQTT.
|
|
||||||
|
|
||||||
## Examples
|
|
||||||
|
|
||||||
The library comes with a number of example sketches. See File > Examples > PubSubClient
|
|
||||||
within the Arduino application.
|
|
||||||
|
|
||||||
Full API documentation is available here: https://pubsubclient.knolleary.net
|
|
||||||
|
|
||||||
## Limitations
|
|
||||||
|
|
||||||
- It can only publish QoS 0 messages. It can subscribe at QoS 0 or QoS 1.
|
|
||||||
- The maximum message size, including header, is **128 bytes** by default. This
|
|
||||||
is configurable via `MQTT_MAX_PACKET_SIZE` in `PubSubClient.h`.
|
|
||||||
- The keepalive interval is set to 15 seconds by default. This is configurable
|
|
||||||
via `MQTT_KEEPALIVE` in `PubSubClient.h`.
|
|
||||||
- The client uses MQTT 3.1.1 by default. It can be changed to use MQTT 3.1 by
|
|
||||||
changing value of `MQTT_VERSION` in `PubSubClient.h`.
|
|
||||||
|
|
||||||
|
|
||||||
## Compatible Hardware
|
|
||||||
|
|
||||||
The library uses the Arduino Ethernet Client api for interacting with the
|
|
||||||
underlying network hardware. This means it Just Works with a growing number of
|
|
||||||
boards and shields, including:
|
|
||||||
|
|
||||||
- Arduino Ethernet
|
|
||||||
- Arduino Ethernet Shield
|
|
||||||
- Arduino YUN – use the included `YunClient` in place of `EthernetClient`, and
|
|
||||||
be sure to do a `Bridge.begin()` first
|
|
||||||
- Arduino WiFi Shield - if you want to send packets > 90 bytes with this shield,
|
|
||||||
enable the `MQTT_MAX_TRANSFER_SIZE` define in `PubSubClient.h`.
|
|
||||||
- Sparkfun WiFly Shield – [library](https://github.com/dpslwk/WiFly)
|
|
||||||
- TI CC3000 WiFi - [library](https://github.com/sparkfun/SFE_CC3000_Library)
|
|
||||||
- Intel Galileo/Edison
|
|
||||||
- ESP8266
|
|
||||||
- ESP32
|
|
||||||
|
|
||||||
The library cannot currently be used with hardware based on the ENC28J60 chip –
|
|
||||||
such as the Nanode or the Nuelectronics Ethernet Shield. For those, there is an
|
|
||||||
[alternative library](https://github.com/njh/NanodeMQTT) available.
|
|
||||||
|
|
||||||
## License
|
|
||||||
|
|
||||||
This code is released under the MIT License.
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
/*
|
|
||||||
Basic MQTT example with Authentication
|
|
||||||
|
|
||||||
- connects to an MQTT server, providing username
|
|
||||||
and password
|
|
||||||
- publishes "hello world" to the topic "outTopic"
|
|
||||||
- subscribes to the topic "inTopic"
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <SPI.h>
|
|
||||||
#include <Ethernet.h>
|
|
||||||
#include <PubSubClient.h>
|
|
||||||
|
|
||||||
// Update these with values suitable for your network.
|
|
||||||
byte mac[] = { 0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED };
|
|
||||||
IPAddress ip(172, 16, 0, 100);
|
|
||||||
IPAddress server(172, 16, 0, 2);
|
|
||||||
|
|
||||||
void callback(char* topic, byte* payload, unsigned int length) {
|
|
||||||
// handle message arrived
|
|
||||||
}
|
|
||||||
|
|
||||||
EthernetClient ethClient;
|
|
||||||
PubSubClient client(server, 1883, callback, ethClient);
|
|
||||||
|
|
||||||
void setup()
|
|
||||||
{
|
|
||||||
Ethernet.begin(mac, ip);
|
|
||||||
// Note - the default maximum packet size is 128 bytes. If the
|
|
||||||
// combined length of clientId, username and password exceed this,
|
|
||||||
// you will need to increase the value of MQTT_MAX_PACKET_SIZE in
|
|
||||||
// PubSubClient.h
|
|
||||||
|
|
||||||
if (client.connect("arduinoClient", "testuser", "testpass")) {
|
|
||||||
client.publish("outTopic","hello world");
|
|
||||||
client.subscribe("inTopic");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop()
|
|
||||||
{
|
|
||||||
client.loop();
|
|
||||||
}
|
|
||||||
@ -1,77 +0,0 @@
|
|||||||
/*
|
|
||||||
Basic MQTT example
|
|
||||||
|
|
||||||
This sketch demonstrates the basic capabilities of the library.
|
|
||||||
It connects to an MQTT server then:
|
|
||||||
- publishes "hello world" to the topic "outTopic"
|
|
||||||
- subscribes to the topic "inTopic", printing out any messages
|
|
||||||
it receives. NB - it assumes the received payloads are strings not binary
|
|
||||||
|
|
||||||
It will reconnect to the server if the connection is lost using a blocking
|
|
||||||
reconnect function. See the 'mqtt_reconnect_nonblocking' example for how to
|
|
||||||
achieve the same result without blocking the main loop.
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <SPI.h>
|
|
||||||
#include <Ethernet.h>
|
|
||||||
#include <PubSubClient.h>
|
|
||||||
|
|
||||||
// Update these with values suitable for your network.
|
|
||||||
byte mac[] = { 0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED };
|
|
||||||
IPAddress ip(172, 16, 0, 100);
|
|
||||||
IPAddress server(172, 16, 0, 2);
|
|
||||||
|
|
||||||
void callback(char* topic, byte* payload, unsigned int length) {
|
|
||||||
Serial.print("Message arrived [");
|
|
||||||
Serial.print(topic);
|
|
||||||
Serial.print("] ");
|
|
||||||
for (int i=0;i<length;i++) {
|
|
||||||
Serial.print((char)payload[i]);
|
|
||||||
}
|
|
||||||
Serial.println();
|
|
||||||
}
|
|
||||||
|
|
||||||
EthernetClient ethClient;
|
|
||||||
PubSubClient client(ethClient);
|
|
||||||
|
|
||||||
void reconnect() {
|
|
||||||
// Loop until we're reconnected
|
|
||||||
while (!client.connected()) {
|
|
||||||
Serial.print("Attempting MQTT connection...");
|
|
||||||
// Attempt to connect
|
|
||||||
if (client.connect("arduinoClient")) {
|
|
||||||
Serial.println("connected");
|
|
||||||
// Once connected, publish an announcement...
|
|
||||||
client.publish("outTopic","hello world");
|
|
||||||
// ... and resubscribe
|
|
||||||
client.subscribe("inTopic");
|
|
||||||
} else {
|
|
||||||
Serial.print("failed, rc=");
|
|
||||||
Serial.print(client.state());
|
|
||||||
Serial.println(" try again in 5 seconds");
|
|
||||||
// Wait 5 seconds before retrying
|
|
||||||
delay(5000);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void setup()
|
|
||||||
{
|
|
||||||
Serial.begin(57600);
|
|
||||||
|
|
||||||
client.setServer(server, 1883);
|
|
||||||
client.setCallback(callback);
|
|
||||||
|
|
||||||
Ethernet.begin(mac, ip);
|
|
||||||
// Allow the hardware to sort itself out
|
|
||||||
delay(1500);
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop()
|
|
||||||
{
|
|
||||||
if (!client.connected()) {
|
|
||||||
reconnect();
|
|
||||||
}
|
|
||||||
client.loop();
|
|
||||||
}
|
|
||||||
@ -1,132 +0,0 @@
|
|||||||
/*
|
|
||||||
Basic ESP8266 MQTT example
|
|
||||||
|
|
||||||
This sketch demonstrates the capabilities of the pubsub library in combination
|
|
||||||
with the ESP8266 board/library.
|
|
||||||
|
|
||||||
It connects to an MQTT server then:
|
|
||||||
- publishes "hello world" to the topic "outTopic" every two seconds
|
|
||||||
- subscribes to the topic "inTopic", printing out any messages
|
|
||||||
it receives. NB - it assumes the received payloads are strings not binary
|
|
||||||
- If the first character of the topic "inTopic" is an 1, switch ON the ESP Led,
|
|
||||||
else switch it off
|
|
||||||
|
|
||||||
It will reconnect to the server if the connection is lost using a blocking
|
|
||||||
reconnect function. See the 'mqtt_reconnect_nonblocking' example for how to
|
|
||||||
achieve the same result without blocking the main loop.
|
|
||||||
|
|
||||||
To install the ESP8266 board, (using Arduino 1.6.4+):
|
|
||||||
- Add the following 3rd party board manager under "File -> Preferences -> Additional Boards Manager URLs":
|
|
||||||
http://arduino.esp8266.com/stable/package_esp8266com_index.json
|
|
||||||
- Open the "Tools -> Board -> Board Manager" and click install for the ESP8266"
|
|
||||||
- Select your ESP8266 in "Tools -> Board"
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <ESP8266WiFi.h>
|
|
||||||
#include <PubSubClient.h>
|
|
||||||
|
|
||||||
// Update these with values suitable for your network.
|
|
||||||
|
|
||||||
const char* ssid = "........";
|
|
||||||
const char* password = "........";
|
|
||||||
const char* mqtt_server = "broker.mqtt-dashboard.com";
|
|
||||||
|
|
||||||
WiFiClient espClient;
|
|
||||||
PubSubClient client(espClient);
|
|
||||||
long lastMsg = 0;
|
|
||||||
char msg[50];
|
|
||||||
int value = 0;
|
|
||||||
|
|
||||||
void setup_wifi() {
|
|
||||||
|
|
||||||
delay(10);
|
|
||||||
// We start by connecting to a WiFi network
|
|
||||||
Serial.println();
|
|
||||||
Serial.print("Connecting to ");
|
|
||||||
Serial.println(ssid);
|
|
||||||
|
|
||||||
WiFi.begin(ssid, password);
|
|
||||||
|
|
||||||
while (WiFi.status() != WL_CONNECTED) {
|
|
||||||
delay(500);
|
|
||||||
Serial.print(".");
|
|
||||||
}
|
|
||||||
|
|
||||||
randomSeed(micros());
|
|
||||||
|
|
||||||
Serial.println("");
|
|
||||||
Serial.println("WiFi connected");
|
|
||||||
Serial.println("IP address: ");
|
|
||||||
Serial.println(WiFi.localIP());
|
|
||||||
}
|
|
||||||
|
|
||||||
void callback(char* topic, byte* payload, unsigned int length) {
|
|
||||||
Serial.print("Message arrived [");
|
|
||||||
Serial.print(topic);
|
|
||||||
Serial.print("] ");
|
|
||||||
for (int i = 0; i < length; i++) {
|
|
||||||
Serial.print((char)payload[i]);
|
|
||||||
}
|
|
||||||
Serial.println();
|
|
||||||
|
|
||||||
// Switch on the LED if an 1 was received as first character
|
|
||||||
if ((char)payload[0] == '1') {
|
|
||||||
digitalWrite(BUILTIN_LED, LOW); // Turn the LED on (Note that LOW is the voltage level
|
|
||||||
// but actually the LED is on; this is because
|
|
||||||
// it is active low on the ESP-01)
|
|
||||||
} else {
|
|
||||||
digitalWrite(BUILTIN_LED, HIGH); // Turn the LED off by making the voltage HIGH
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void reconnect() {
|
|
||||||
// Loop until we're reconnected
|
|
||||||
while (!client.connected()) {
|
|
||||||
Serial.print("Attempting MQTT connection...");
|
|
||||||
// Create a random client ID
|
|
||||||
String clientId = "ESP8266Client-";
|
|
||||||
clientId += String(random(0xffff), HEX);
|
|
||||||
// Attempt to connect
|
|
||||||
if (client.connect(clientId.c_str())) {
|
|
||||||
Serial.println("connected");
|
|
||||||
// Once connected, publish an announcement...
|
|
||||||
client.publish("outTopic", "hello world");
|
|
||||||
// ... and resubscribe
|
|
||||||
client.subscribe("inTopic");
|
|
||||||
} else {
|
|
||||||
Serial.print("failed, rc=");
|
|
||||||
Serial.print(client.state());
|
|
||||||
Serial.println(" try again in 5 seconds");
|
|
||||||
// Wait 5 seconds before retrying
|
|
||||||
delay(5000);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void setup() {
|
|
||||||
pinMode(BUILTIN_LED, OUTPUT); // Initialize the BUILTIN_LED pin as an output
|
|
||||||
Serial.begin(115200);
|
|
||||||
setup_wifi();
|
|
||||||
client.setServer(mqtt_server, 1883);
|
|
||||||
client.setCallback(callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop() {
|
|
||||||
|
|
||||||
if (!client.connected()) {
|
|
||||||
reconnect();
|
|
||||||
}
|
|
||||||
client.loop();
|
|
||||||
|
|
||||||
long now = millis();
|
|
||||||
if (now - lastMsg > 2000) {
|
|
||||||
lastMsg = now;
|
|
||||||
++value;
|
|
||||||
snprintf (msg, 50, "hello world #%ld", value);
|
|
||||||
Serial.print("Publish message: ");
|
|
||||||
Serial.println(msg);
|
|
||||||
client.publish("outTopic", msg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,179 +0,0 @@
|
|||||||
/*
|
|
||||||
Long message ESP8266 MQTT example
|
|
||||||
|
|
||||||
This sketch demonstrates sending arbitrarily large messages in combination
|
|
||||||
with the ESP8266 board/library.
|
|
||||||
|
|
||||||
It connects to an MQTT server then:
|
|
||||||
- publishes "hello world" to the topic "outTopic"
|
|
||||||
- subscribes to the topic "greenBottles/#", printing out any messages
|
|
||||||
it receives. NB - it assumes the received payloads are strings not binary
|
|
||||||
- If the sub-topic is a number, it publishes a "greenBottles/lyrics" message
|
|
||||||
with a payload consisting of the lyrics to "10 green bottles", replacing
|
|
||||||
10 with the number given in the sub-topic.
|
|
||||||
|
|
||||||
It will reconnect to the server if the connection is lost using a blocking
|
|
||||||
reconnect function. See the 'mqtt_reconnect_nonblocking' example for how to
|
|
||||||
achieve the same result without blocking the main loop.
|
|
||||||
|
|
||||||
To install the ESP8266 board, (using Arduino 1.6.4+):
|
|
||||||
- Add the following 3rd party board manager under "File -> Preferences -> Additional Boards Manager URLs":
|
|
||||||
http://arduino.esp8266.com/stable/package_esp8266com_index.json
|
|
||||||
- Open the "Tools -> Board -> Board Manager" and click install for the ESP8266"
|
|
||||||
- Select your ESP8266 in "Tools -> Board"
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <ESP8266WiFi.h>
|
|
||||||
#include <PubSubClient.h>
|
|
||||||
|
|
||||||
// Update these with values suitable for your network.
|
|
||||||
|
|
||||||
const char* ssid = "........";
|
|
||||||
const char* password = "........";
|
|
||||||
const char* mqtt_server = "broker.mqtt-dashboard.com";
|
|
||||||
|
|
||||||
WiFiClient espClient;
|
|
||||||
PubSubClient client(espClient);
|
|
||||||
long lastMsg = 0;
|
|
||||||
char msg[50];
|
|
||||||
int value = 0;
|
|
||||||
|
|
||||||
void setup_wifi() {
|
|
||||||
|
|
||||||
delay(10);
|
|
||||||
// We start by connecting to a WiFi network
|
|
||||||
Serial.println();
|
|
||||||
Serial.print("Connecting to ");
|
|
||||||
Serial.println(ssid);
|
|
||||||
|
|
||||||
WiFi.begin(ssid, password);
|
|
||||||
|
|
||||||
while (WiFi.status() != WL_CONNECTED) {
|
|
||||||
delay(500);
|
|
||||||
Serial.print(".");
|
|
||||||
}
|
|
||||||
|
|
||||||
randomSeed(micros());
|
|
||||||
|
|
||||||
Serial.println("");
|
|
||||||
Serial.println("WiFi connected");
|
|
||||||
Serial.println("IP address: ");
|
|
||||||
Serial.println(WiFi.localIP());
|
|
||||||
}
|
|
||||||
|
|
||||||
void callback(char* topic, byte* payload, unsigned int length) {
|
|
||||||
Serial.print("Message arrived [");
|
|
||||||
Serial.print(topic);
|
|
||||||
Serial.print("] ");
|
|
||||||
for (int i = 0; i < length; i++) {
|
|
||||||
Serial.print((char)payload[i]);
|
|
||||||
}
|
|
||||||
Serial.println();
|
|
||||||
|
|
||||||
// Find out how many bottles we should generate lyrics for
|
|
||||||
String topicStr(topic);
|
|
||||||
int bottleCount = 0; // assume no bottles unless we correctly parse a value from the topic
|
|
||||||
if (topicStr.indexOf('/') >= 0) {
|
|
||||||
// The topic includes a '/', we'll try to read the number of bottles from just after that
|
|
||||||
topicStr.remove(0, topicStr.indexOf('/')+1);
|
|
||||||
// Now see if there's a number of bottles after the '/'
|
|
||||||
bottleCount = topicStr.toInt();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (bottleCount > 0) {
|
|
||||||
// Work out how big our resulting message will be
|
|
||||||
int msgLen = 0;
|
|
||||||
for (int i = bottleCount; i > 0; i--) {
|
|
||||||
String numBottles(i);
|
|
||||||
msgLen += 2*numBottles.length();
|
|
||||||
if (i == 1) {
|
|
||||||
msgLen += 2*String(" green bottle, standing on the wall\n").length();
|
|
||||||
} else {
|
|
||||||
msgLen += 2*String(" green bottles, standing on the wall\n").length();
|
|
||||||
}
|
|
||||||
msgLen += String("And if one green bottle should accidentally fall\nThere'll be ").length();
|
|
||||||
switch (i) {
|
|
||||||
case 1:
|
|
||||||
msgLen += String("no green bottles, standing on the wall\n\n").length();
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
msgLen += String("1 green bottle, standing on the wall\n\n").length();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
numBottles = i-1;
|
|
||||||
msgLen += numBottles.length();
|
|
||||||
msgLen += String(" green bottles, standing on the wall\n\n").length();
|
|
||||||
break;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Now we can start to publish the message
|
|
||||||
client.beginPublish("greenBottles/lyrics", msgLen, false);
|
|
||||||
for (int i = bottleCount; i > 0; i--) {
|
|
||||||
for (int j = 0; j < 2; j++) {
|
|
||||||
client.print(i);
|
|
||||||
if (i == 1) {
|
|
||||||
client.print(" green bottle, standing on the wall\n");
|
|
||||||
} else {
|
|
||||||
client.print(" green bottles, standing on the wall\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
client.print("And if one green bottle should accidentally fall\nThere'll be ");
|
|
||||||
switch (i) {
|
|
||||||
case 1:
|
|
||||||
client.print("no green bottles, standing on the wall\n\n");
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
client.print("1 green bottle, standing on the wall\n\n");
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
client.print(i-1);
|
|
||||||
client.print(" green bottles, standing on the wall\n\n");
|
|
||||||
break;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
// Now we're done!
|
|
||||||
client.endPublish();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void reconnect() {
|
|
||||||
// Loop until we're reconnected
|
|
||||||
while (!client.connected()) {
|
|
||||||
Serial.print("Attempting MQTT connection...");
|
|
||||||
// Create a random client ID
|
|
||||||
String clientId = "ESP8266Client-";
|
|
||||||
clientId += String(random(0xffff), HEX);
|
|
||||||
// Attempt to connect
|
|
||||||
if (client.connect(clientId.c_str())) {
|
|
||||||
Serial.println("connected");
|
|
||||||
// Once connected, publish an announcement...
|
|
||||||
client.publish("outTopic", "hello world");
|
|
||||||
// ... and resubscribe
|
|
||||||
client.subscribe("greenBottles/#");
|
|
||||||
} else {
|
|
||||||
Serial.print("failed, rc=");
|
|
||||||
Serial.print(client.state());
|
|
||||||
Serial.println(" try again in 5 seconds");
|
|
||||||
// Wait 5 seconds before retrying
|
|
||||||
delay(5000);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void setup() {
|
|
||||||
pinMode(BUILTIN_LED, OUTPUT); // Initialize the BUILTIN_LED pin as an output
|
|
||||||
Serial.begin(115200);
|
|
||||||
setup_wifi();
|
|
||||||
client.setServer(mqtt_server, 1883);
|
|
||||||
client.setCallback(callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop() {
|
|
||||||
|
|
||||||
if (!client.connected()) {
|
|
||||||
reconnect();
|
|
||||||
}
|
|
||||||
client.loop();
|
|
||||||
}
|
|
||||||
@ -1,60 +0,0 @@
|
|||||||
/*
|
|
||||||
Publishing in the callback
|
|
||||||
|
|
||||||
- connects to an MQTT server
|
|
||||||
- subscribes to the topic "inTopic"
|
|
||||||
- when a message is received, republishes it to "outTopic"
|
|
||||||
|
|
||||||
This example shows how to publish messages within the
|
|
||||||
callback function. The callback function header needs to
|
|
||||||
be declared before the PubSubClient constructor and the
|
|
||||||
actual callback defined afterwards.
|
|
||||||
This ensures the client reference in the callback function
|
|
||||||
is valid.
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <SPI.h>
|
|
||||||
#include <Ethernet.h>
|
|
||||||
#include <PubSubClient.h>
|
|
||||||
|
|
||||||
// Update these with values suitable for your network.
|
|
||||||
byte mac[] = { 0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED };
|
|
||||||
IPAddress ip(172, 16, 0, 100);
|
|
||||||
IPAddress server(172, 16, 0, 2);
|
|
||||||
|
|
||||||
// Callback function header
|
|
||||||
void callback(char* topic, byte* payload, unsigned int length);
|
|
||||||
|
|
||||||
EthernetClient ethClient;
|
|
||||||
PubSubClient client(server, 1883, callback, ethClient);
|
|
||||||
|
|
||||||
// Callback function
|
|
||||||
void callback(char* topic, byte* payload, unsigned int length) {
|
|
||||||
// In order to republish this payload, a copy must be made
|
|
||||||
// as the orignal payload buffer will be overwritten whilst
|
|
||||||
// constructing the PUBLISH packet.
|
|
||||||
|
|
||||||
// Allocate the correct amount of memory for the payload copy
|
|
||||||
byte* p = (byte*)malloc(length);
|
|
||||||
// Copy the payload to the new buffer
|
|
||||||
memcpy(p,payload,length);
|
|
||||||
client.publish("outTopic", p, length);
|
|
||||||
// Free the memory
|
|
||||||
free(p);
|
|
||||||
}
|
|
||||||
|
|
||||||
void setup()
|
|
||||||
{
|
|
||||||
|
|
||||||
Ethernet.begin(mac, ip);
|
|
||||||
if (client.connect("arduinoClient")) {
|
|
||||||
client.publish("outTopic","hello world");
|
|
||||||
client.subscribe("inTopic");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop()
|
|
||||||
{
|
|
||||||
client.loop();
|
|
||||||
}
|
|
||||||
@ -1,67 +0,0 @@
|
|||||||
/*
|
|
||||||
Reconnecting MQTT example - non-blocking
|
|
||||||
|
|
||||||
This sketch demonstrates how to keep the client connected
|
|
||||||
using a non-blocking reconnect function. If the client loses
|
|
||||||
its connection, it attempts to reconnect every 5 seconds
|
|
||||||
without blocking the main loop.
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <SPI.h>
|
|
||||||
#include <Ethernet.h>
|
|
||||||
#include <PubSubClient.h>
|
|
||||||
|
|
||||||
// Update these with values suitable for your hardware/network.
|
|
||||||
byte mac[] = { 0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED };
|
|
||||||
IPAddress ip(172, 16, 0, 100);
|
|
||||||
IPAddress server(172, 16, 0, 2);
|
|
||||||
|
|
||||||
void callback(char* topic, byte* payload, unsigned int length) {
|
|
||||||
// handle message arrived
|
|
||||||
}
|
|
||||||
|
|
||||||
EthernetClient ethClient;
|
|
||||||
PubSubClient client(ethClient);
|
|
||||||
|
|
||||||
long lastReconnectAttempt = 0;
|
|
||||||
|
|
||||||
boolean reconnect() {
|
|
||||||
if (client.connect("arduinoClient")) {
|
|
||||||
// Once connected, publish an announcement...
|
|
||||||
client.publish("outTopic","hello world");
|
|
||||||
// ... and resubscribe
|
|
||||||
client.subscribe("inTopic");
|
|
||||||
}
|
|
||||||
return client.connected();
|
|
||||||
}
|
|
||||||
|
|
||||||
void setup()
|
|
||||||
{
|
|
||||||
client.setServer(server, 1883);
|
|
||||||
client.setCallback(callback);
|
|
||||||
|
|
||||||
Ethernet.begin(mac, ip);
|
|
||||||
delay(1500);
|
|
||||||
lastReconnectAttempt = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void loop()
|
|
||||||
{
|
|
||||||
if (!client.connected()) {
|
|
||||||
long now = millis();
|
|
||||||
if (now - lastReconnectAttempt > 5000) {
|
|
||||||
lastReconnectAttempt = now;
|
|
||||||
// Attempt to reconnect
|
|
||||||
if (reconnect()) {
|
|
||||||
lastReconnectAttempt = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Client connected
|
|
||||||
|
|
||||||
client.loop();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,57 +0,0 @@
|
|||||||
/*
|
|
||||||
Example of using a Stream object to store the message payload
|
|
||||||
|
|
||||||
Uses SRAM library: https://github.com/ennui2342/arduino-sram
|
|
||||||
but could use any Stream based class such as SD
|
|
||||||
|
|
||||||
- connects to an MQTT server
|
|
||||||
- publishes "hello world" to the topic "outTopic"
|
|
||||||
- subscribes to the topic "inTopic"
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <SPI.h>
|
|
||||||
#include <Ethernet.h>
|
|
||||||
#include <PubSubClient.h>
|
|
||||||
#include <SRAM.h>
|
|
||||||
|
|
||||||
// Update these with values suitable for your network.
|
|
||||||
byte mac[] = { 0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED };
|
|
||||||
IPAddress ip(172, 16, 0, 100);
|
|
||||||
IPAddress server(172, 16, 0, 2);
|
|
||||||
|
|
||||||
SRAM sram(4, SRAM_1024);
|
|
||||||
|
|
||||||
void callback(char* topic, byte* payload, unsigned int length) {
|
|
||||||
sram.seek(1);
|
|
||||||
|
|
||||||
// do something with the message
|
|
||||||
for(uint8_t i=0; i<length; i++) {
|
|
||||||
Serial.write(sram.read());
|
|
||||||
}
|
|
||||||
Serial.println();
|
|
||||||
|
|
||||||
// Reset position for the next message to be stored
|
|
||||||
sram.seek(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
EthernetClient ethClient;
|
|
||||||
PubSubClient client(server, 1883, callback, ethClient, sram);
|
|
||||||
|
|
||||||
void setup()
|
|
||||||
{
|
|
||||||
Ethernet.begin(mac, ip);
|
|
||||||
if (client.connect("arduinoClient")) {
|
|
||||||
client.publish("outTopic","hello world");
|
|
||||||
client.subscribe("inTopic");
|
|
||||||
}
|
|
||||||
|
|
||||||
sram.begin();
|
|
||||||
sram.seek(1);
|
|
||||||
|
|
||||||
Serial.begin(9600);
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop()
|
|
||||||
{
|
|
||||||
client.loop();
|
|
||||||
}
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
#######################################
|
|
||||||
# Syntax Coloring Map For PubSubClient
|
|
||||||
#######################################
|
|
||||||
|
|
||||||
#######################################
|
|
||||||
# Datatypes (KEYWORD1)
|
|
||||||
#######################################
|
|
||||||
|
|
||||||
PubSubClient KEYWORD1
|
|
||||||
|
|
||||||
#######################################
|
|
||||||
# Methods and Functions (KEYWORD2)
|
|
||||||
#######################################
|
|
||||||
|
|
||||||
connect KEYWORD2
|
|
||||||
disconnect KEYWORD2
|
|
||||||
publish KEYWORD2
|
|
||||||
publish_P KEYWORD2
|
|
||||||
beginPublish KEYWORD2
|
|
||||||
endPublish KEYWORD2
|
|
||||||
write KEYWORD2
|
|
||||||
subscribe KEYWORD2
|
|
||||||
unsubscribe KEYWORD2
|
|
||||||
loop KEYWORD2
|
|
||||||
connected KEYWORD2
|
|
||||||
setServer KEYWORD2
|
|
||||||
setCallback KEYWORD2
|
|
||||||
setClient KEYWORD2
|
|
||||||
setStream KEYWORD2
|
|
||||||
|
|
||||||
#######################################
|
|
||||||
# Constants (LITERAL1)
|
|
||||||
#######################################
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "PubSubClient",
|
|
||||||
"keywords": "ethernet, mqtt, m2m, iot",
|
|
||||||
"description": "A client library for MQTT messaging. MQTT is a lightweight messaging protocol ideal for small devices. This library allows you to send and receive MQTT messages. It supports the latest MQTT 3.1.1 protocol and can be configured to use the older MQTT 3.1 if needed. It supports all Arduino Ethernet Client compatible hardware, including the Intel Galileo/Edison, ESP8266 and TI CC3000.",
|
|
||||||
"repository": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/knolleary/pubsubclient.git"
|
|
||||||
},
|
|
||||||
"version": "2.7",
|
|
||||||
"exclude": "tests",
|
|
||||||
"examples": "examples/*/*.ino",
|
|
||||||
"frameworks": "arduino",
|
|
||||||
"platforms": [
|
|
||||||
"atmelavr",
|
|
||||||
"espressif"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
name=PubSubClient
|
|
||||||
version=2.7
|
|
||||||
author=Nick O'Leary <nick.oleary@gmail.com>
|
|
||||||
maintainer=Nick O'Leary <nick.oleary@gmail.com>
|
|
||||||
sentence=A client library for MQTT messaging.
|
|
||||||
paragraph=MQTT is a lightweight messaging protocol ideal for small devices. This library allows you to send and receive MQTT messages. It supports the latest MQTT 3.1.1 protocol and can be configured to use the older MQTT 3.1 if needed. It supports all Arduino Ethernet Client compatible hardware, including the Intel Galileo/Edison, ESP8266 and TI CC3000.
|
|
||||||
category=Communication
|
|
||||||
url=http://pubsubclient.knolleary.net
|
|
||||||
architectures=*
|
|
||||||
@ -1,692 +0,0 @@
|
|||||||
/*
|
|
||||||
PubSubClient.cpp - A simple client for MQTT.
|
|
||||||
Nick O'Leary
|
|
||||||
http://knolleary.net
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "PubSubClient.h"
|
|
||||||
#include "Arduino.h"
|
|
||||||
|
|
||||||
PubSubClient::PubSubClient() {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
this->_client = NULL;
|
|
||||||
this->stream = NULL;
|
|
||||||
setCallback(NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient::PubSubClient(Client& client) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setClient(client);
|
|
||||||
this->stream = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient::PubSubClient(IPAddress addr, uint16_t port, Client& client) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(addr, port);
|
|
||||||
setClient(client);
|
|
||||||
this->stream = NULL;
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(IPAddress addr, uint16_t port, Client& client, Stream& stream) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(addr,port);
|
|
||||||
setClient(client);
|
|
||||||
setStream(stream);
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(IPAddress addr, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(addr, port);
|
|
||||||
setCallback(callback);
|
|
||||||
setClient(client);
|
|
||||||
this->stream = NULL;
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(IPAddress addr, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(addr,port);
|
|
||||||
setCallback(callback);
|
|
||||||
setClient(client);
|
|
||||||
setStream(stream);
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, Client& client) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(ip, port);
|
|
||||||
setClient(client);
|
|
||||||
this->stream = NULL;
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, Client& client, Stream& stream) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(ip,port);
|
|
||||||
setClient(client);
|
|
||||||
setStream(stream);
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(ip, port);
|
|
||||||
setCallback(callback);
|
|
||||||
setClient(client);
|
|
||||||
this->stream = NULL;
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(ip,port);
|
|
||||||
setCallback(callback);
|
|
||||||
setClient(client);
|
|
||||||
setStream(stream);
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient::PubSubClient(const char* domain, uint16_t port, Client& client) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(domain,port);
|
|
||||||
setClient(client);
|
|
||||||
this->stream = NULL;
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(const char* domain, uint16_t port, Client& client, Stream& stream) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(domain,port);
|
|
||||||
setClient(client);
|
|
||||||
setStream(stream);
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(const char* domain, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(domain,port);
|
|
||||||
setCallback(callback);
|
|
||||||
setClient(client);
|
|
||||||
this->stream = NULL;
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(const char* domain, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(domain,port);
|
|
||||||
setCallback(callback);
|
|
||||||
setClient(client);
|
|
||||||
setStream(stream);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::connect(const char *id) {
|
|
||||||
return connect(id,NULL,NULL,0,0,0,0,1);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::connect(const char *id, const char *user, const char *pass) {
|
|
||||||
return connect(id,user,pass,0,0,0,0,1);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::connect(const char *id, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage) {
|
|
||||||
return connect(id,NULL,NULL,willTopic,willQos,willRetain,willMessage,1);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::connect(const char *id, const char *user, const char *pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage) {
|
|
||||||
return connect(id,user,pass,willTopic,willQos,willRetain,willMessage,1);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::connect(const char *id, const char *user, const char *pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage, boolean cleanSession) {
|
|
||||||
if (!connected()) {
|
|
||||||
int result = 0;
|
|
||||||
|
|
||||||
if (_client == nullptr) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (_client->connected()) {
|
|
||||||
result = 1;
|
|
||||||
} else {
|
|
||||||
if (domain.length() != 0) {
|
|
||||||
result = _client->connect(this->domain.c_str(), this->port);
|
|
||||||
} else {
|
|
||||||
result = _client->connect(this->ip, this->port);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (result == 1) {
|
|
||||||
nextMsgId = 1;
|
|
||||||
// Leave room in the buffer for header and variable length field
|
|
||||||
uint16_t length = MQTT_MAX_HEADER_SIZE;
|
|
||||||
unsigned int j;
|
|
||||||
|
|
||||||
#if MQTT_VERSION == MQTT_VERSION_3_1
|
|
||||||
uint8_t d[9] = {0x00,0x06,'M','Q','I','s','d','p', MQTT_VERSION};
|
|
||||||
#define MQTT_HEADER_VERSION_LENGTH 9
|
|
||||||
#elif MQTT_VERSION == MQTT_VERSION_3_1_1
|
|
||||||
uint8_t d[7] = {0x00,0x04,'M','Q','T','T',MQTT_VERSION};
|
|
||||||
#define MQTT_HEADER_VERSION_LENGTH 7
|
|
||||||
#endif
|
|
||||||
for (j = 0;j<MQTT_HEADER_VERSION_LENGTH;j++) {
|
|
||||||
buffer[length++] = d[j];
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t v;
|
|
||||||
if (willTopic) {
|
|
||||||
v = 0x04|(willQos<<3)|(willRetain<<5);
|
|
||||||
} else {
|
|
||||||
v = 0x00;
|
|
||||||
}
|
|
||||||
if (cleanSession) {
|
|
||||||
v = v|0x02;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(user != NULL) {
|
|
||||||
v = v|0x80;
|
|
||||||
|
|
||||||
if(pass != NULL) {
|
|
||||||
v = v|(0x80>>1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
buffer[length++] = v;
|
|
||||||
|
|
||||||
buffer[length++] = ((MQTT_KEEPALIVE) >> 8);
|
|
||||||
buffer[length++] = ((MQTT_KEEPALIVE) & 0xFF);
|
|
||||||
|
|
||||||
CHECK_STRING_LENGTH(length,id)
|
|
||||||
length = writeString(id,buffer,length);
|
|
||||||
if (willTopic) {
|
|
||||||
CHECK_STRING_LENGTH(length,willTopic)
|
|
||||||
length = writeString(willTopic,buffer,length);
|
|
||||||
CHECK_STRING_LENGTH(length,willMessage)
|
|
||||||
length = writeString(willMessage,buffer,length);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(user != NULL) {
|
|
||||||
CHECK_STRING_LENGTH(length,user)
|
|
||||||
length = writeString(user,buffer,length);
|
|
||||||
if(pass != NULL) {
|
|
||||||
CHECK_STRING_LENGTH(length,pass)
|
|
||||||
length = writeString(pass,buffer,length);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
write(MQTTCONNECT,buffer,length-MQTT_MAX_HEADER_SIZE);
|
|
||||||
|
|
||||||
lastInActivity = lastOutActivity = millis();
|
|
||||||
|
|
||||||
while (!_client->available()) {
|
|
||||||
delay(0); // Prevent watchdog crashes
|
|
||||||
unsigned long t = millis();
|
|
||||||
if (t-lastInActivity >= ((int32_t) MQTT_SOCKET_TIMEOUT*1000UL)) {
|
|
||||||
_state = MQTT_CONNECTION_TIMEOUT;
|
|
||||||
_client->stop();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
uint8_t llen;
|
|
||||||
uint16_t len = readPacket(&llen);
|
|
||||||
|
|
||||||
if (len == 4) {
|
|
||||||
if (buffer[3] == 0) {
|
|
||||||
lastInActivity = millis();
|
|
||||||
pingOutstanding = false;
|
|
||||||
_state = MQTT_CONNECTED;
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
_state = buffer[3];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_client->stop();
|
|
||||||
} else {
|
|
||||||
_state = MQTT_CONNECT_FAILED;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// reads a byte into result
|
|
||||||
boolean PubSubClient::readByte(uint8_t * result) {
|
|
||||||
if (_client == nullptr) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
uint32_t previousMillis = millis();
|
|
||||||
while(!_client->available()) {
|
|
||||||
delay(1); // Prevent watchdog crashes
|
|
||||||
uint32_t currentMillis = millis();
|
|
||||||
if(currentMillis - previousMillis >= ((int32_t) MQTT_SOCKET_TIMEOUT * 1000)){
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*result = _client->read();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// reads a byte into result[*index] and increments index
|
|
||||||
boolean PubSubClient::readByte(uint8_t * result, uint16_t * index){
|
|
||||||
uint16_t current_index = *index;
|
|
||||||
uint8_t * write_address = &(result[current_index]);
|
|
||||||
if(readByte(write_address)){
|
|
||||||
*index = current_index + 1;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint16_t PubSubClient::readPacket(uint8_t* lengthLength) {
|
|
||||||
uint16_t len = 0;
|
|
||||||
if(!readByte(buffer, &len)) return 0;
|
|
||||||
bool isPublish = (buffer[0]&0xF0) == MQTTPUBLISH;
|
|
||||||
uint32_t multiplier = 1;
|
|
||||||
uint16_t length = 0;
|
|
||||||
uint8_t digit = 0;
|
|
||||||
uint16_t skip = 0;
|
|
||||||
uint8_t start = 0;
|
|
||||||
|
|
||||||
do {
|
|
||||||
if (len == 5) {
|
|
||||||
// Invalid remaining length encoding - kill the connection
|
|
||||||
_state = MQTT_DISCONNECTED;
|
|
||||||
_client->stop();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if(!readByte(&digit)) return 0;
|
|
||||||
buffer[len++] = digit;
|
|
||||||
length += (digit & 127) * multiplier;
|
|
||||||
multiplier *= 128;
|
|
||||||
} while ((digit & 128) != 0 && len < (MQTT_MAX_PACKET_SIZE -2));
|
|
||||||
*lengthLength = len-1;
|
|
||||||
|
|
||||||
if (isPublish) {
|
|
||||||
// Read in topic length to calculate bytes to skip over for Stream writing
|
|
||||||
if(!readByte(buffer, &len)) return 0;
|
|
||||||
if(!readByte(buffer, &len)) return 0;
|
|
||||||
skip = (buffer[*lengthLength+1]<<8)+buffer[*lengthLength+2];
|
|
||||||
start = 2;
|
|
||||||
if (buffer[0]&MQTTQOS1) {
|
|
||||||
// skip message id
|
|
||||||
skip += 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (uint16_t i = start;i<length;i++) {
|
|
||||||
if(!readByte(&digit)) return 0;
|
|
||||||
if (this->stream) {
|
|
||||||
if (isPublish && len-*lengthLength-2>skip) {
|
|
||||||
this->stream->write(digit);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (len < MQTT_MAX_PACKET_SIZE) {
|
|
||||||
buffer[len] = digit;
|
|
||||||
}
|
|
||||||
len++;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!this->stream && len > MQTT_MAX_PACKET_SIZE) {
|
|
||||||
len = 0; // This will cause the packet to be ignored.
|
|
||||||
}
|
|
||||||
|
|
||||||
return len;
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::loop() {
|
|
||||||
if (connected()) {
|
|
||||||
unsigned long t = millis();
|
|
||||||
if ((t - lastInActivity > MQTT_KEEPALIVE*1000UL) || (t - lastOutActivity > MQTT_KEEPALIVE*1000UL)) {
|
|
||||||
if (pingOutstanding) {
|
|
||||||
this->_state = MQTT_CONNECTION_TIMEOUT;
|
|
||||||
_client->stop();
|
|
||||||
return false;
|
|
||||||
} else {
|
|
||||||
buffer[0] = MQTTPINGREQ;
|
|
||||||
buffer[1] = 0;
|
|
||||||
if (_client->write(buffer,2) != 0) {
|
|
||||||
lastOutActivity = t;
|
|
||||||
lastInActivity = t;
|
|
||||||
}
|
|
||||||
pingOutstanding = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (_client->available()) {
|
|
||||||
uint8_t llen;
|
|
||||||
uint16_t len = readPacket(&llen);
|
|
||||||
uint16_t msgId = 0;
|
|
||||||
uint8_t *payload;
|
|
||||||
if (len > 0) {
|
|
||||||
lastInActivity = t;
|
|
||||||
uint8_t type = buffer[0]&0xF0;
|
|
||||||
if (type == MQTTPUBLISH) {
|
|
||||||
if (callback) {
|
|
||||||
uint16_t tl = (buffer[llen+1]<<8)+buffer[llen+2]; /* topic length in bytes */
|
|
||||||
memmove(buffer+llen+2,buffer+llen+3,tl); /* move topic inside buffer 1 byte to front */
|
|
||||||
buffer[llen+2+tl] = 0; /* end the topic as a 'C' string with \x00 */
|
|
||||||
char *topic = (char*) buffer+llen+2;
|
|
||||||
// msgId only present for QOS>0
|
|
||||||
if ((buffer[0]&0x06) == MQTTQOS1) {
|
|
||||||
msgId = (buffer[llen+3+tl]<<8)+buffer[llen+3+tl+1];
|
|
||||||
payload = buffer+llen+3+tl+2;
|
|
||||||
callback(topic,payload,len-llen-3-tl-2);
|
|
||||||
|
|
||||||
buffer[0] = MQTTPUBACK;
|
|
||||||
buffer[1] = 2;
|
|
||||||
buffer[2] = (msgId >> 8);
|
|
||||||
buffer[3] = (msgId & 0xFF);
|
|
||||||
if (_client->write(buffer,4) != 0) {
|
|
||||||
lastOutActivity = t;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
payload = buffer+llen+3+tl;
|
|
||||||
callback(topic,payload,len-llen-3-tl);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (type == MQTTPINGREQ) {
|
|
||||||
buffer[0] = MQTTPINGRESP;
|
|
||||||
buffer[1] = 0;
|
|
||||||
_client->write(buffer,2);
|
|
||||||
} else if (type == MQTTPINGRESP) {
|
|
||||||
pingOutstanding = false;
|
|
||||||
}
|
|
||||||
} else if (!connected()) {
|
|
||||||
// readPacket has closed the connection
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::publish(const char* topic, const char* payload) {
|
|
||||||
size_t plength = (payload != nullptr) ? strlen(payload) : 0;
|
|
||||||
return publish(topic,(const uint8_t*)payload,plength,false);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::publish(const char* topic, const char* payload, boolean retained) {
|
|
||||||
size_t plength = (payload != nullptr) ? strlen(payload) : 0;
|
|
||||||
return publish(topic,(const uint8_t*)payload,plength,retained);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::publish(const char* topic, const uint8_t* payload, unsigned int plength) {
|
|
||||||
return publish(topic, payload, plength, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::publish(const char* topic, const uint8_t* payload, unsigned int plength, boolean retained) {
|
|
||||||
if (connected()) {
|
|
||||||
if (MQTT_MAX_PACKET_SIZE < MQTT_MAX_HEADER_SIZE + 2+strlen(topic) + plength) {
|
|
||||||
// Too long
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
// Leave room in the buffer for header and variable length field
|
|
||||||
uint16_t length = MQTT_MAX_HEADER_SIZE;
|
|
||||||
length = writeString(topic,buffer,length);
|
|
||||||
uint16_t i;
|
|
||||||
for (i=0;i<plength;i++) {
|
|
||||||
buffer[length++] = payload[i];
|
|
||||||
}
|
|
||||||
uint8_t header = MQTTPUBLISH;
|
|
||||||
if (retained) {
|
|
||||||
header |= 1;
|
|
||||||
}
|
|
||||||
return write(header,buffer,length-MQTT_MAX_HEADER_SIZE);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::publish_P(const char* topic, const char* payload, boolean retained) {
|
|
||||||
size_t plength = (payload != nullptr) ? strlen(payload) : 0;
|
|
||||||
return publish_P(topic, (const uint8_t*)payload, plength, retained);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::publish_P(const char* topic, const uint8_t* payload, unsigned int plength, boolean retained) {
|
|
||||||
uint8_t llen = 0;
|
|
||||||
uint8_t digit;
|
|
||||||
unsigned int rc = 0;
|
|
||||||
uint16_t tlen;
|
|
||||||
unsigned int pos = 0;
|
|
||||||
unsigned int i;
|
|
||||||
uint8_t header;
|
|
||||||
unsigned int len;
|
|
||||||
|
|
||||||
if (!connected()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
tlen = strlen(topic);
|
|
||||||
|
|
||||||
header = MQTTPUBLISH;
|
|
||||||
if (retained) {
|
|
||||||
header |= 1;
|
|
||||||
}
|
|
||||||
buffer[pos++] = header;
|
|
||||||
len = plength + 2 + tlen;
|
|
||||||
do {
|
|
||||||
digit = len % 128;
|
|
||||||
len = len / 128;
|
|
||||||
if (len > 0) {
|
|
||||||
digit |= 0x80;
|
|
||||||
}
|
|
||||||
buffer[pos++] = digit;
|
|
||||||
llen++;
|
|
||||||
} while(len>0);
|
|
||||||
|
|
||||||
pos = writeString(topic,buffer,pos);
|
|
||||||
|
|
||||||
rc += _client->write(buffer,pos);
|
|
||||||
|
|
||||||
for (i=0;i<plength;i++) {
|
|
||||||
rc += _client->write((char)pgm_read_byte_near(payload + i));
|
|
||||||
}
|
|
||||||
if (rc > 0) {
|
|
||||||
lastOutActivity = millis();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Header (1 byte) + llen + identifier (2 bytes) + topic len + payload len
|
|
||||||
const unsigned int expectedLength = 1 + llen + 2 + tlen + plength;
|
|
||||||
return (rc == expectedLength);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::beginPublish(const char* topic, unsigned int plength, boolean retained) {
|
|
||||||
if (connected()) {
|
|
||||||
// Send the header and variable length field
|
|
||||||
uint16_t length = MQTT_MAX_HEADER_SIZE;
|
|
||||||
length = writeString(topic,buffer,length);
|
|
||||||
uint8_t header = MQTTPUBLISH;
|
|
||||||
if (retained) {
|
|
||||||
header |= 1;
|
|
||||||
}
|
|
||||||
size_t hlen = buildHeader(header, buffer, plength+length-MQTT_MAX_HEADER_SIZE);
|
|
||||||
uint16_t rc = _client->write(buffer+(MQTT_MAX_HEADER_SIZE-hlen),length-(MQTT_MAX_HEADER_SIZE-hlen));
|
|
||||||
if (rc > 0) {
|
|
||||||
lastOutActivity = millis();
|
|
||||||
}
|
|
||||||
return (rc == (length-(MQTT_MAX_HEADER_SIZE-hlen)));
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
int PubSubClient::endPublish() {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t PubSubClient::write(uint8_t data) {
|
|
||||||
if (_client == nullptr) {
|
|
||||||
lastOutActivity = millis();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
size_t rc = _client->write(data);
|
|
||||||
if (rc != 0) {
|
|
||||||
lastOutActivity = millis();
|
|
||||||
}
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t PubSubClient::write(const uint8_t *buffer, size_t size) {
|
|
||||||
if (_client == nullptr) {
|
|
||||||
lastOutActivity = millis();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
size_t rc = _client->write(buffer,size);
|
|
||||||
if (rc != 0) {
|
|
||||||
lastOutActivity = millis();
|
|
||||||
}
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t PubSubClient::buildHeader(uint8_t header, uint8_t* buf, uint16_t length) {
|
|
||||||
uint8_t lenBuf[4];
|
|
||||||
uint8_t llen = 0;
|
|
||||||
uint8_t digit;
|
|
||||||
uint8_t pos = 0;
|
|
||||||
uint16_t len = length;
|
|
||||||
do {
|
|
||||||
digit = len % 128;
|
|
||||||
len = len / 128;
|
|
||||||
if (len > 0) {
|
|
||||||
digit |= 0x80;
|
|
||||||
}
|
|
||||||
lenBuf[pos++] = digit;
|
|
||||||
llen++;
|
|
||||||
} while(len>0);
|
|
||||||
|
|
||||||
buf[4-llen] = header;
|
|
||||||
for (int i=0;i<llen;i++) {
|
|
||||||
buf[MQTT_MAX_HEADER_SIZE-llen+i] = lenBuf[i];
|
|
||||||
}
|
|
||||||
return llen+1; // Full header size is variable length bit plus the 1-byte fixed header
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::write(uint8_t header, uint8_t* buf, uint16_t length) {
|
|
||||||
uint16_t rc;
|
|
||||||
uint8_t hlen = buildHeader(header, buf, length);
|
|
||||||
|
|
||||||
#ifdef MQTT_MAX_TRANSFER_SIZE
|
|
||||||
uint8_t* writeBuf = buf+(MQTT_MAX_HEADER_SIZE-hlen);
|
|
||||||
uint16_t bytesRemaining = length+hlen; //Match the length type
|
|
||||||
uint8_t bytesToWrite;
|
|
||||||
boolean result = true;
|
|
||||||
while((bytesRemaining > 0) && result) {
|
|
||||||
delay(0); // Prevent watchdog crashes
|
|
||||||
bytesToWrite = (bytesRemaining > MQTT_MAX_TRANSFER_SIZE)?MQTT_MAX_TRANSFER_SIZE:bytesRemaining;
|
|
||||||
rc = _client->write(writeBuf,bytesToWrite);
|
|
||||||
result = (rc == bytesToWrite);
|
|
||||||
bytesRemaining -= rc;
|
|
||||||
writeBuf += rc;
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
#else
|
|
||||||
rc = _client->write(buf+(MQTT_MAX_HEADER_SIZE-hlen),length+hlen);
|
|
||||||
if (rc != 0) {
|
|
||||||
lastOutActivity = millis();
|
|
||||||
}
|
|
||||||
return (rc == hlen+length);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::subscribe(const char* topic) {
|
|
||||||
return subscribe(topic, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::subscribe(const char* topic, uint8_t qos) {
|
|
||||||
if (qos > 1) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (MQTT_MAX_PACKET_SIZE < 9 + strlen(topic)) {
|
|
||||||
// Too long
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (connected()) {
|
|
||||||
// Leave room in the buffer for header and variable length field
|
|
||||||
uint16_t length = MQTT_MAX_HEADER_SIZE;
|
|
||||||
nextMsgId++;
|
|
||||||
if (nextMsgId == 0) {
|
|
||||||
nextMsgId = 1;
|
|
||||||
}
|
|
||||||
buffer[length++] = (nextMsgId >> 8);
|
|
||||||
buffer[length++] = (nextMsgId & 0xFF);
|
|
||||||
length = writeString((char*)topic, buffer,length);
|
|
||||||
buffer[length++] = qos;
|
|
||||||
return write(MQTTSUBSCRIBE|MQTTQOS1,buffer,length-MQTT_MAX_HEADER_SIZE);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::unsubscribe(const char* topic) {
|
|
||||||
if (MQTT_MAX_PACKET_SIZE < 9 + strlen(topic)) {
|
|
||||||
// Too long
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (connected()) {
|
|
||||||
uint16_t length = MQTT_MAX_HEADER_SIZE;
|
|
||||||
nextMsgId++;
|
|
||||||
if (nextMsgId == 0) {
|
|
||||||
nextMsgId = 1;
|
|
||||||
}
|
|
||||||
buffer[length++] = (nextMsgId >> 8);
|
|
||||||
buffer[length++] = (nextMsgId & 0xFF);
|
|
||||||
length = writeString(topic, buffer,length);
|
|
||||||
return write(MQTTUNSUBSCRIBE|MQTTQOS1,buffer,length-MQTT_MAX_HEADER_SIZE);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void PubSubClient::disconnect(bool disconnect_package) {
|
|
||||||
buffer[0] = MQTTDISCONNECT;
|
|
||||||
buffer[1] = 0;
|
|
||||||
if (_client != nullptr) {
|
|
||||||
if (disconnect_package) {
|
|
||||||
_client->write(buffer,2);
|
|
||||||
}
|
|
||||||
_client->flush();
|
|
||||||
_client->stop();
|
|
||||||
}
|
|
||||||
_state = MQTT_DISCONNECTED;
|
|
||||||
lastInActivity = lastOutActivity = millis();
|
|
||||||
}
|
|
||||||
|
|
||||||
uint16_t PubSubClient::writeString(const char* string, uint8_t* buf, uint16_t pos) {
|
|
||||||
const char* idp = string;
|
|
||||||
uint16_t i = 0;
|
|
||||||
pos += 2;
|
|
||||||
while (*idp && pos < (MQTT_MAX_PACKET_SIZE - 2)) {
|
|
||||||
buf[pos++] = *idp++;
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
buf[pos-i-2] = (i >> 8);
|
|
||||||
buf[pos-i-1] = (i & 0xFF);
|
|
||||||
return pos;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
boolean PubSubClient::connected() {
|
|
||||||
if (_client == NULL ) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (_client->connected() == 0) {
|
|
||||||
bool lastStateConnected = this->_state == MQTT_CONNECTED;
|
|
||||||
this->disconnect();
|
|
||||||
if (lastStateConnected) {
|
|
||||||
this->_state = MQTT_CONNECTION_LOST;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return this->_state == MQTT_CONNECTED;
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient& PubSubClient::setServer(uint8_t * ip, uint16_t port) {
|
|
||||||
IPAddress addr(ip[0],ip[1],ip[2],ip[3]);
|
|
||||||
return setServer(addr,port);
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient& PubSubClient::setServer(IPAddress ip, uint16_t port) {
|
|
||||||
this->ip = ip;
|
|
||||||
this->port = port;
|
|
||||||
this->domain = "";
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient& PubSubClient::setServer(const char * domain, uint16_t port) {
|
|
||||||
this->domain = domain;
|
|
||||||
this->port = port;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient& PubSubClient::setCallback(MQTT_CALLBACK_SIGNATURE) {
|
|
||||||
this->callback = callback;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient& PubSubClient::setClient(Client& client){
|
|
||||||
this->_client = &client;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient& PubSubClient::setStream(Stream& stream){
|
|
||||||
this->stream = &stream;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
int PubSubClient::state() {
|
|
||||||
return this->_state;
|
|
||||||
}
|
|
||||||
@ -1,178 +0,0 @@
|
|||||||
/*
|
|
||||||
PubSubClient.h - A simple client for MQTT.
|
|
||||||
Nick O'Leary
|
|
||||||
http://knolleary.net
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef PubSubClient_h
|
|
||||||
#define PubSubClient_h
|
|
||||||
|
|
||||||
#include <Arduino.h>
|
|
||||||
#include "IPAddress.h"
|
|
||||||
#include "Client.h"
|
|
||||||
#include "Stream.h"
|
|
||||||
|
|
||||||
#define MQTT_VERSION_3_1 3
|
|
||||||
#define MQTT_VERSION_3_1_1 4
|
|
||||||
|
|
||||||
// MQTT_VERSION : Pick the version
|
|
||||||
//#define MQTT_VERSION MQTT_VERSION_3_1
|
|
||||||
#ifndef MQTT_VERSION
|
|
||||||
#define MQTT_VERSION MQTT_VERSION_3_1_1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// MQTT_MAX_PACKET_SIZE : Maximum packet size
|
|
||||||
#ifndef MQTT_MAX_PACKET_SIZE
|
|
||||||
//#define MQTT_MAX_PACKET_SIZE 128
|
|
||||||
//#define MQTT_MAX_PACKET_SIZE 1000 // Tasmota v5.11.1c
|
|
||||||
#define MQTT_MAX_PACKET_SIZE 1200 // Tasmota v8.1.0.8
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// MQTT_KEEPALIVE : keepAlive interval in Seconds
|
|
||||||
// Keepalive timeout for default MQTT Broker is 10s
|
|
||||||
#ifndef MQTT_KEEPALIVE
|
|
||||||
//#define MQTT_KEEPALIVE 10
|
|
||||||
#define MQTT_KEEPALIVE 30 // Tasmota v6.5.0.14 enabling AWS-iot
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// MQTT_SOCKET_TIMEOUT: socket timeout interval in Seconds
|
|
||||||
#ifndef MQTT_SOCKET_TIMEOUT
|
|
||||||
#define MQTT_SOCKET_TIMEOUT 15
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// MQTT_MAX_TRANSFER_SIZE : limit how much data is passed to the network client
|
|
||||||
// in each write call. Needed for the Arduino Wifi Shield. Leave undefined to
|
|
||||||
// pass the entire MQTT packet in each write call.
|
|
||||||
//#define MQTT_MAX_TRANSFER_SIZE 80
|
|
||||||
|
|
||||||
// Possible values for client.state()
|
|
||||||
#define MQTT_CONNECTION_TIMEOUT -4
|
|
||||||
#define MQTT_CONNECTION_LOST -3
|
|
||||||
#define MQTT_CONNECT_FAILED -2
|
|
||||||
#define MQTT_DISCONNECTED -1
|
|
||||||
#define MQTT_CONNECTED 0
|
|
||||||
#define MQTT_CONNECT_BAD_PROTOCOL 1
|
|
||||||
#define MQTT_CONNECT_BAD_CLIENT_ID 2
|
|
||||||
#define MQTT_CONNECT_UNAVAILABLE 3
|
|
||||||
#define MQTT_CONNECT_BAD_CREDENTIALS 4
|
|
||||||
#define MQTT_CONNECT_UNAUTHORIZED 5
|
|
||||||
|
|
||||||
#define MQTTCONNECT 1 << 4 // Client request to connect to Server
|
|
||||||
#define MQTTCONNACK 2 << 4 // Connect Acknowledgment
|
|
||||||
#define MQTTPUBLISH 3 << 4 // Publish message
|
|
||||||
#define MQTTPUBACK 4 << 4 // Publish Acknowledgment
|
|
||||||
#define MQTTPUBREC 5 << 4 // Publish Received (assured delivery part 1)
|
|
||||||
#define MQTTPUBREL 6 << 4 // Publish Release (assured delivery part 2)
|
|
||||||
#define MQTTPUBCOMP 7 << 4 // Publish Complete (assured delivery part 3)
|
|
||||||
#define MQTTSUBSCRIBE 8 << 4 // Client Subscribe request
|
|
||||||
#define MQTTSUBACK 9 << 4 // Subscribe Acknowledgment
|
|
||||||
#define MQTTUNSUBSCRIBE 10 << 4 // Client Unsubscribe request
|
|
||||||
#define MQTTUNSUBACK 11 << 4 // Unsubscribe Acknowledgment
|
|
||||||
#define MQTTPINGREQ 12 << 4 // PING Request
|
|
||||||
#define MQTTPINGRESP 13 << 4 // PING Response
|
|
||||||
#define MQTTDISCONNECT 14 << 4 // Client is Disconnecting
|
|
||||||
#define MQTTReserved 15 << 4 // Reserved
|
|
||||||
|
|
||||||
#define MQTTQOS0 (0 << 1)
|
|
||||||
#define MQTTQOS1 (1 << 1)
|
|
||||||
#define MQTTQOS2 (2 << 1)
|
|
||||||
|
|
||||||
// Maximum size of fixed header and variable length size header
|
|
||||||
#define MQTT_MAX_HEADER_SIZE 5
|
|
||||||
|
|
||||||
#if defined(ESP8266) || defined(ESP32)
|
|
||||||
#include <functional>
|
|
||||||
#define MQTT_CALLBACK_SIGNATURE std::function<void(char*, uint8_t*, unsigned int)> callback
|
|
||||||
#else
|
|
||||||
#define MQTT_CALLBACK_SIGNATURE void (*callback)(char*, uint8_t*, unsigned int)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define CHECK_STRING_LENGTH(l,s) if (l+2+strlen(s) > MQTT_MAX_PACKET_SIZE) {_client->stop();return false;}
|
|
||||||
|
|
||||||
class PubSubClient : public Print {
|
|
||||||
private:
|
|
||||||
Client* _client;
|
|
||||||
uint8_t buffer[MQTT_MAX_PACKET_SIZE];
|
|
||||||
uint16_t nextMsgId;
|
|
||||||
unsigned long lastOutActivity;
|
|
||||||
unsigned long lastInActivity;
|
|
||||||
bool pingOutstanding;
|
|
||||||
MQTT_CALLBACK_SIGNATURE;
|
|
||||||
uint16_t readPacket(uint8_t*);
|
|
||||||
boolean readByte(uint8_t * result);
|
|
||||||
boolean readByte(uint8_t * result, uint16_t * index);
|
|
||||||
boolean write(uint8_t header, uint8_t* buf, uint16_t length);
|
|
||||||
uint16_t writeString(const char* string, uint8_t* buf, uint16_t pos);
|
|
||||||
// Build up the header ready to send
|
|
||||||
// Returns the size of the header
|
|
||||||
// Note: the header is built at the end of the first MQTT_MAX_HEADER_SIZE bytes, so will start
|
|
||||||
// (MQTT_MAX_HEADER_SIZE - <returned size>) bytes into the buffer
|
|
||||||
size_t buildHeader(uint8_t header, uint8_t* buf, uint16_t length);
|
|
||||||
IPAddress ip;
|
|
||||||
String domain;
|
|
||||||
uint16_t port;
|
|
||||||
Stream* stream;
|
|
||||||
int _state;
|
|
||||||
public:
|
|
||||||
PubSubClient();
|
|
||||||
PubSubClient(Client& client);
|
|
||||||
PubSubClient(IPAddress, uint16_t, Client& client);
|
|
||||||
PubSubClient(IPAddress, uint16_t, Client& client, Stream&);
|
|
||||||
PubSubClient(IPAddress, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client);
|
|
||||||
PubSubClient(IPAddress, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&);
|
|
||||||
PubSubClient(uint8_t *, uint16_t, Client& client);
|
|
||||||
PubSubClient(uint8_t *, uint16_t, Client& client, Stream&);
|
|
||||||
PubSubClient(uint8_t *, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client);
|
|
||||||
PubSubClient(uint8_t *, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&);
|
|
||||||
PubSubClient(const char*, uint16_t, Client& client);
|
|
||||||
PubSubClient(const char*, uint16_t, Client& client, Stream&);
|
|
||||||
PubSubClient(const char*, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client);
|
|
||||||
PubSubClient(const char*, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&);
|
|
||||||
virtual ~PubSubClient() {}
|
|
||||||
|
|
||||||
PubSubClient& setServer(IPAddress ip, uint16_t port);
|
|
||||||
PubSubClient& setServer(uint8_t * ip, uint16_t port);
|
|
||||||
PubSubClient& setServer(const char * domain, uint16_t port);
|
|
||||||
PubSubClient& setCallback(MQTT_CALLBACK_SIGNATURE);
|
|
||||||
PubSubClient& setClient(Client& client);
|
|
||||||
PubSubClient& setStream(Stream& stream);
|
|
||||||
|
|
||||||
boolean connect(const char* id);
|
|
||||||
boolean connect(const char* id, const char* user, const char* pass);
|
|
||||||
boolean connect(const char* id, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage);
|
|
||||||
boolean connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage);
|
|
||||||
boolean connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage, boolean cleanSession);
|
|
||||||
void disconnect(bool disconnect_package = false);
|
|
||||||
boolean publish(const char* topic, const char* payload);
|
|
||||||
boolean publish(const char* topic, const char* payload, boolean retained);
|
|
||||||
boolean publish(const char* topic, const uint8_t * payload, unsigned int plength);
|
|
||||||
boolean publish(const char* topic, const uint8_t * payload, unsigned int plength, boolean retained);
|
|
||||||
boolean publish_P(const char* topic, const char* payload, boolean retained);
|
|
||||||
boolean publish_P(const char* topic, const uint8_t * payload, unsigned int plength, boolean retained);
|
|
||||||
// Start to publish a message.
|
|
||||||
// This API:
|
|
||||||
// beginPublish(...)
|
|
||||||
// one or more calls to write(...)
|
|
||||||
// endPublish()
|
|
||||||
// Allows for arbitrarily large payloads to be sent without them having to be copied into
|
|
||||||
// a new buffer and held in memory at one time
|
|
||||||
// Returns 1 if the message was started successfully, 0 if there was an error
|
|
||||||
boolean beginPublish(const char* topic, unsigned int plength, boolean retained);
|
|
||||||
// Finish off this publish message (started with beginPublish)
|
|
||||||
// Returns 1 if the packet was sent successfully, 0 if there was an error
|
|
||||||
int endPublish();
|
|
||||||
// Write a single byte of payload (only to be used with beginPublish/endPublish)
|
|
||||||
virtual size_t write(uint8_t);
|
|
||||||
// Write size bytes from buffer into the payload (only to be used with beginPublish/endPublish)
|
|
||||||
// Returns the number of bytes written
|
|
||||||
virtual size_t write(const uint8_t *buffer, size_t size);
|
|
||||||
boolean subscribe(const char* topic);
|
|
||||||
boolean subscribe(const char* topic, uint8_t qos);
|
|
||||||
boolean unsubscribe(const char* topic);
|
|
||||||
boolean loop();
|
|
||||||
boolean connected();
|
|
||||||
int state();
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
.build
|
|
||||||
tmpbin
|
|
||||||
logs
|
|
||||||
*.pyc
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
SRC_PATH=./src
|
|
||||||
OUT_PATH=./bin
|
|
||||||
TEST_SRC=$(wildcard ${SRC_PATH}/*_spec.cpp)
|
|
||||||
TEST_BIN= $(TEST_SRC:${SRC_PATH}/%.cpp=${OUT_PATH}/%)
|
|
||||||
VPATH=${SRC_PATH}
|
|
||||||
SHIM_FILES=${SRC_PATH}/lib/*.cpp
|
|
||||||
PSC_FILE=../src/PubSubClient.cpp
|
|
||||||
CC=g++
|
|
||||||
CFLAGS=-I${SRC_PATH}/lib -I../src
|
|
||||||
|
|
||||||
all: $(TEST_BIN)
|
|
||||||
|
|
||||||
${OUT_PATH}/%: ${SRC_PATH}/%.cpp ${PSC_FILE} ${SHIM_FILES}
|
|
||||||
mkdir -p ${OUT_PATH}
|
|
||||||
${CC} ${CFLAGS} $^ -o $@
|
|
||||||
|
|
||||||
clean:
|
|
||||||
@rm -rf ${OUT_PATH}
|
|
||||||
|
|
||||||
test:
|
|
||||||
@bin/connect_spec
|
|
||||||
@bin/publish_spec
|
|
||||||
@bin/receive_spec
|
|
||||||
@bin/subscribe_spec
|
|
||||||
@bin/keepalive_spec
|
|
||||||
@ -1,93 +0,0 @@
|
|||||||
# Arduino Client for MQTT Test Suite
|
|
||||||
|
|
||||||
This is a regression test suite for the `PubSubClient` library.
|
|
||||||
|
|
||||||
There are two parts:
|
|
||||||
|
|
||||||
- Tests that can be compiled and run on any machine
|
|
||||||
- Tests that build the example sketches using the Arduino IDE
|
|
||||||
|
|
||||||
|
|
||||||
It is a work-in-progress and is subject to complete refactoring as the whim takes
|
|
||||||
me.
|
|
||||||
|
|
||||||
|
|
||||||
## Local tests
|
|
||||||
|
|
||||||
These are a set of executables that can be run to test specific areas of functionality.
|
|
||||||
They do not require a real Arduino to be attached, nor the use of the Arduino IDE.
|
|
||||||
|
|
||||||
The tests include a set of mock files to stub out the parts of the Arduino environment the library
|
|
||||||
depends on.
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- g++
|
|
||||||
|
|
||||||
### Running
|
|
||||||
|
|
||||||
Build the tests using the provided `Makefile`:
|
|
||||||
|
|
||||||
$ make
|
|
||||||
|
|
||||||
This will create a set of executables in `./bin/`. Run each of these executables to test the corresponding functionality.
|
|
||||||
|
|
||||||
*Note:* the `connect_spec` and `keepalive_spec` tests involve testing keepalive timers so naturally take a few minutes to run through.
|
|
||||||
|
|
||||||
## Arduino tests
|
|
||||||
|
|
||||||
*Note:* INO Tool doesn't currently play nicely with Arduino 1.5. This has broken this test suite.
|
|
||||||
|
|
||||||
Without a suitable arduino plugged in, the test suite will only check the
|
|
||||||
example sketches compile cleanly against the library.
|
|
||||||
|
|
||||||
With an arduino plugged in, each sketch that has a corresponding python
|
|
||||||
test case is built, uploaded and then the tests run.
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Python 2.7+
|
|
||||||
- [INO Tool](http://inotool.org/) - this provides command-line build/upload of Arduino sketches
|
|
||||||
|
|
||||||
### Running
|
|
||||||
|
|
||||||
The test suite _does not_ run an MQTT server - it is assumed to be running already.
|
|
||||||
|
|
||||||
$ python testsuite.py
|
|
||||||
|
|
||||||
A summary of activity is printed to the console. More comprehensive logs are written
|
|
||||||
to the `logs` directory.
|
|
||||||
|
|
||||||
### What it does
|
|
||||||
|
|
||||||
For each sketch in the library's `examples` directory, e.g. `mqtt_basic.ino`, the suite looks for a matching test case
|
|
||||||
`testcases/mqtt_basic.py`.
|
|
||||||
|
|
||||||
The test case must follow these conventions:
|
|
||||||
- sub-class `unittest.TestCase`
|
|
||||||
- provide the class methods `setUpClass` and `tearDownClass` (TODO: make this optional)
|
|
||||||
- all test method names begin with `test_`
|
|
||||||
|
|
||||||
The suite will call the `setUpClass` method _before_ uploading the sketch. This
|
|
||||||
allows any test setup to be performed before the sketch runs - such as connecting
|
|
||||||
a client and subscribing to topics.
|
|
||||||
|
|
||||||
|
|
||||||
### Settings
|
|
||||||
|
|
||||||
The file `testcases/settings.py` is used to config the test environment.
|
|
||||||
|
|
||||||
- `server_ip` - the IP address of the broker the client should connect to (the broker port is assumed to be 1883).
|
|
||||||
- `arduino_ip` - the IP address the arduino should use (when not testing DHCP).
|
|
||||||
|
|
||||||
Before each sketch is compiled, these values are automatically substituted in. To
|
|
||||||
do this, the suite looks for lines that _start_ with the following:
|
|
||||||
|
|
||||||
byte server[] = {
|
|
||||||
byte ip[] = {
|
|
||||||
|
|
||||||
and replaces them with the appropriate values.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,302 +0,0 @@
|
|||||||
#include "PubSubClient.h"
|
|
||||||
#include "ShimClient.h"
|
|
||||||
#include "Buffer.h"
|
|
||||||
#include "BDDTest.h"
|
|
||||||
#include "trace.h"
|
|
||||||
|
|
||||||
|
|
||||||
byte server[] = { 172, 16, 0, 2 };
|
|
||||||
|
|
||||||
void callback(char* topic, byte* payload, unsigned int length) {
|
|
||||||
// handle message arrived
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int test_connect_fails_no_network() {
|
|
||||||
IT("fails to connect if underlying client doesn't connect");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(false);
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_FALSE(rc);
|
|
||||||
int state = client.state();
|
|
||||||
IS_TRUE(state == MQTT_CONNECT_FAILED);
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_connect_fails_on_no_response() {
|
|
||||||
IT("fails to connect if no response received after 15 seconds");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_FALSE(rc);
|
|
||||||
int state = client.state();
|
|
||||||
IS_TRUE(state == MQTT_CONNECTION_TIMEOUT);
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_connect_properly_formatted() {
|
|
||||||
IT("sends a properly formatted connect packet and succeeds");
|
|
||||||
ShimClient shimClient;
|
|
||||||
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
byte expectServer[] = { 172, 16, 0, 2 };
|
|
||||||
shimClient.expectConnect(expectServer,1883);
|
|
||||||
byte connect[] = {0x10,0x18,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31};
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
|
|
||||||
shimClient.expect(connect,26);
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int state = client.state();
|
|
||||||
IS_TRUE(state == MQTT_DISCONNECTED);
|
|
||||||
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
state = client.state();
|
|
||||||
IS_TRUE(state == MQTT_CONNECTED);
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_connect_properly_formatted_hostname() {
|
|
||||||
IT("accepts a hostname");
|
|
||||||
ShimClient shimClient;
|
|
||||||
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
shimClient.expectConnect((char* const)"localhost",1883);
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client((char* const)"localhost", 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int test_connect_fails_on_bad_rc() {
|
|
||||||
IT("fails to connect if a bad return code is received");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x01 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_FALSE(rc);
|
|
||||||
|
|
||||||
int state = client.state();
|
|
||||||
IS_TRUE(state == 0x01);
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_connect_non_clean_session() {
|
|
||||||
IT("sends a properly formatted non-clean session connect packet and succeeds");
|
|
||||||
ShimClient shimClient;
|
|
||||||
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
byte expectServer[] = { 172, 16, 0, 2 };
|
|
||||||
shimClient.expectConnect(expectServer,1883);
|
|
||||||
byte connect[] = {0x10,0x18,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x0,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31};
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
|
|
||||||
shimClient.expect(connect,26);
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int state = client.state();
|
|
||||||
IS_TRUE(state == MQTT_DISCONNECTED);
|
|
||||||
|
|
||||||
int rc = client.connect((char*)"client_test1",0,0,0,0,0,0,0);
|
|
||||||
IS_TRUE(rc);
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
state = client.state();
|
|
||||||
IS_TRUE(state == MQTT_CONNECTED);
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_connect_accepts_username_password() {
|
|
||||||
IT("accepts a username and password");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connect[] = { 0x10,0x24,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0xc2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x4,0x75,0x73,0x65,0x72,0x0,0x4,0x70,0x61,0x73,0x73};
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.expect(connect,0x26);
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1",(char*)"user",(char*)"pass");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_connect_accepts_username_no_password() {
|
|
||||||
IT("accepts a username but no password");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connect[] = { 0x10,0x1e,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x82,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x4,0x75,0x73,0x65,0x72};
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.expect(connect,0x20);
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1",(char*)"user",0);
|
|
||||||
IS_TRUE(rc);
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
int test_connect_accepts_username_blank_password() {
|
|
||||||
IT("accepts a username and blank password");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connect[] = { 0x10,0x20,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0xc2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x4,0x75,0x73,0x65,0x72,0x0,0x0};
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.expect(connect,0x26);
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1",(char*)"user",(char*)"pass");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_connect_ignores_password_no_username() {
|
|
||||||
IT("ignores a password but no username");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connect[] = {0x10,0x18,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31};
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.expect(connect,26);
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1",0,(char*)"pass");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_connect_with_will() {
|
|
||||||
IT("accepts a will");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connect[] = {0x10,0x30,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0xe,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x9,0x77,0x69,0x6c,0x6c,0x54,0x6f,0x70,0x69,0x63,0x0,0xb,0x77,0x69,0x6c,0x6c,0x4d,0x65,0x73,0x73,0x61,0x67,0x65};
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.expect(connect,0x32);
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1",(char*)"willTopic",1,0,(char*)"willMessage");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_connect_with_will_username_password() {
|
|
||||||
IT("accepts a will, username and password");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connect[] = {0x10,0x40,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0xce,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x9,0x77,0x69,0x6c,0x6c,0x54,0x6f,0x70,0x69,0x63,0x0,0xb,0x77,0x69,0x6c,0x6c,0x4d,0x65,0x73,0x73,0x61,0x67,0x65,0x0,0x4,0x75,0x73,0x65,0x72,0x0,0x8,0x70,0x61,0x73,0x73,0x77,0x6f,0x72,0x64};
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.expect(connect,0x42);
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1",(char*)"user",(char*)"password",(char*)"willTopic",1,0,(char*)"willMessage");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_connect_disconnect_connect() {
|
|
||||||
IT("connects, disconnects and connects again");
|
|
||||||
ShimClient shimClient;
|
|
||||||
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
byte expectServer[] = { 172, 16, 0, 2 };
|
|
||||||
shimClient.expectConnect(expectServer,1883);
|
|
||||||
byte connect[] = {0x10,0x18,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31};
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
|
|
||||||
shimClient.expect(connect,26);
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
|
|
||||||
int state = client.state();
|
|
||||||
IS_TRUE(state == MQTT_DISCONNECTED);
|
|
||||||
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
state = client.state();
|
|
||||||
IS_TRUE(state == MQTT_CONNECTED);
|
|
||||||
|
|
||||||
byte disconnect[] = {0xE0,0x00};
|
|
||||||
shimClient.expect(disconnect,2);
|
|
||||||
|
|
||||||
client.disconnect();
|
|
||||||
|
|
||||||
IS_FALSE(client.connected());
|
|
||||||
IS_FALSE(shimClient.connected());
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
state = client.state();
|
|
||||||
IS_TRUE(state == MQTT_DISCONNECTED);
|
|
||||||
|
|
||||||
shimClient.expect(connect,28);
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
state = client.state();
|
|
||||||
IS_TRUE(state == MQTT_CONNECTED);
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
SUITE("Connect");
|
|
||||||
|
|
||||||
test_connect_fails_no_network();
|
|
||||||
test_connect_fails_on_no_response();
|
|
||||||
|
|
||||||
test_connect_properly_formatted();
|
|
||||||
test_connect_non_clean_session();
|
|
||||||
test_connect_accepts_username_password();
|
|
||||||
test_connect_fails_on_bad_rc();
|
|
||||||
test_connect_properly_formatted_hostname();
|
|
||||||
|
|
||||||
test_connect_accepts_username_no_password();
|
|
||||||
test_connect_ignores_password_no_username();
|
|
||||||
test_connect_with_will();
|
|
||||||
test_connect_with_will_username_password();
|
|
||||||
test_connect_disconnect_connect();
|
|
||||||
FINISH
|
|
||||||
}
|
|
||||||
@ -1,185 +0,0 @@
|
|||||||
#include "PubSubClient.h"
|
|
||||||
#include "ShimClient.h"
|
|
||||||
#include "Buffer.h"
|
|
||||||
#include "BDDTest.h"
|
|
||||||
#include "trace.h"
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
byte server[] = { 172, 16, 0, 2 };
|
|
||||||
|
|
||||||
void callback(char* topic, byte* payload, unsigned int length) {
|
|
||||||
// handle message arrived
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int test_keepalive_pings_idle() {
|
|
||||||
IT("keeps an idle connection alive (takes 1 minute)");
|
|
||||||
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte pingreq[] = { 0xC0,0x0 };
|
|
||||||
shimClient.expect(pingreq,2);
|
|
||||||
byte pingresp[] = { 0xD0,0x0 };
|
|
||||||
shimClient.respond(pingresp,2);
|
|
||||||
|
|
||||||
for (int i = 0; i < 50; i++) {
|
|
||||||
sleep(1);
|
|
||||||
if ( i == 15 || i == 31 || i == 47) {
|
|
||||||
shimClient.expect(pingreq,2);
|
|
||||||
shimClient.respond(pingresp,2);
|
|
||||||
}
|
|
||||||
rc = client.loop();
|
|
||||||
IS_TRUE(rc);
|
|
||||||
}
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_keepalive_pings_with_outbound_qos0() {
|
|
||||||
IT("keeps a connection alive that only sends qos0 (takes 1 minute)");
|
|
||||||
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
|
|
||||||
|
|
||||||
for (int i = 0; i < 50; i++) {
|
|
||||||
TRACE(i<<":");
|
|
||||||
shimClient.expect(publish,16);
|
|
||||||
rc = client.publish((char*)"topic",(char*)"payload");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
sleep(1);
|
|
||||||
if ( i == 15 || i == 31 || i == 47) {
|
|
||||||
byte pingreq[] = { 0xC0,0x0 };
|
|
||||||
shimClient.expect(pingreq,2);
|
|
||||||
byte pingresp[] = { 0xD0,0x0 };
|
|
||||||
shimClient.respond(pingresp,2);
|
|
||||||
}
|
|
||||||
rc = client.loop();
|
|
||||||
IS_TRUE(rc);
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
}
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_keepalive_pings_with_inbound_qos0() {
|
|
||||||
IT("keeps a connection alive that only receives qos0 (takes 1 minute)");
|
|
||||||
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
|
|
||||||
|
|
||||||
for (int i = 0; i < 50; i++) {
|
|
||||||
TRACE(i<<":");
|
|
||||||
sleep(1);
|
|
||||||
if ( i == 15 || i == 31 || i == 47) {
|
|
||||||
byte pingreq[] = { 0xC0,0x0 };
|
|
||||||
shimClient.expect(pingreq,2);
|
|
||||||
byte pingresp[] = { 0xD0,0x0 };
|
|
||||||
shimClient.respond(pingresp,2);
|
|
||||||
}
|
|
||||||
shimClient.respond(publish,16);
|
|
||||||
rc = client.loop();
|
|
||||||
IS_TRUE(rc);
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
}
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_keepalive_no_pings_inbound_qos1() {
|
|
||||||
IT("does not send pings for connections with inbound qos1 (takes 1 minute)");
|
|
||||||
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte publish[] = {0x32,0x10,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x12,0x34,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
|
|
||||||
byte puback[] = {0x40,0x2,0x12,0x34};
|
|
||||||
|
|
||||||
for (int i = 0; i < 50; i++) {
|
|
||||||
shimClient.respond(publish,18);
|
|
||||||
shimClient.expect(puback,4);
|
|
||||||
sleep(1);
|
|
||||||
rc = client.loop();
|
|
||||||
IS_TRUE(rc);
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
}
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_keepalive_disconnects_hung() {
|
|
||||||
IT("disconnects a hung connection (takes 30 seconds)");
|
|
||||||
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte pingreq[] = { 0xC0,0x0 };
|
|
||||||
shimClient.expect(pingreq,2);
|
|
||||||
|
|
||||||
for (int i = 0; i < 32; i++) {
|
|
||||||
sleep(1);
|
|
||||||
rc = client.loop();
|
|
||||||
}
|
|
||||||
IS_FALSE(rc);
|
|
||||||
|
|
||||||
int state = client.state();
|
|
||||||
IS_TRUE(state == MQTT_CONNECTION_TIMEOUT);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
SUITE("Keep-alive");
|
|
||||||
test_keepalive_pings_idle();
|
|
||||||
test_keepalive_pings_with_outbound_qos0();
|
|
||||||
test_keepalive_pings_with_inbound_qos0();
|
|
||||||
test_keepalive_no_pings_inbound_qos1();
|
|
||||||
test_keepalive_disconnects_hung();
|
|
||||||
|
|
||||||
FINISH
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
#ifndef Arduino_h
|
|
||||||
#define Arduino_h
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <math.h>
|
|
||||||
#include "Print.h"
|
|
||||||
|
|
||||||
|
|
||||||
extern "C"{
|
|
||||||
typedef uint8_t byte ;
|
|
||||||
typedef uint8_t boolean ;
|
|
||||||
|
|
||||||
/* sketch */
|
|
||||||
extern void setup( void ) ;
|
|
||||||
extern void loop( void ) ;
|
|
||||||
uint32_t millis( void );
|
|
||||||
}
|
|
||||||
|
|
||||||
#define PROGMEM
|
|
||||||
#define pgm_read_byte_near(x) *(x)
|
|
||||||
|
|
||||||
#define yield(x) {}
|
|
||||||
|
|
||||||
#endif // Arduino_h
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
#include "BDDTest.h"
|
|
||||||
#include "trace.h"
|
|
||||||
#include <sstream>
|
|
||||||
#include <iostream>
|
|
||||||
#include <string>
|
|
||||||
#include <list>
|
|
||||||
|
|
||||||
int testCount = 0;
|
|
||||||
int testPasses = 0;
|
|
||||||
const char* testDescription;
|
|
||||||
|
|
||||||
std::list<std::string> failureList;
|
|
||||||
|
|
||||||
void bddtest_suite(const char* name) {
|
|
||||||
LOG(name << "\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
int bddtest_test(const char* file, int line, const char* assertion, int result) {
|
|
||||||
if (!result) {
|
|
||||||
LOG("✗\n");
|
|
||||||
std::ostringstream os;
|
|
||||||
os << " ! "<<testDescription<<"\n " <<file << ":" <<line<<" : "<<assertion<<" ["<<result<<"]";
|
|
||||||
failureList.push_back(os.str());
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
void bddtest_start(const char* description) {
|
|
||||||
LOG(" - "<<description<<" ");
|
|
||||||
testDescription = description;
|
|
||||||
testCount ++;
|
|
||||||
}
|
|
||||||
void bddtest_end() {
|
|
||||||
LOG("✓\n");
|
|
||||||
testPasses ++;
|
|
||||||
}
|
|
||||||
|
|
||||||
int bddtest_summary() {
|
|
||||||
for (std::list<std::string>::iterator it = failureList.begin(); it != failureList.end(); it++) {
|
|
||||||
LOG("\n");
|
|
||||||
LOG(*it);
|
|
||||||
LOG("\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
LOG(std::dec << testPasses << "/" << testCount << " tests passed\n\n");
|
|
||||||
if (testPasses == testCount) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
#ifndef bddtest_h
|
|
||||||
#define bddtest_h
|
|
||||||
|
|
||||||
void bddtest_suite(const char* name);
|
|
||||||
int bddtest_test(const char*, int, const char*, int);
|
|
||||||
void bddtest_start(const char*);
|
|
||||||
void bddtest_end();
|
|
||||||
int bddtest_summary();
|
|
||||||
|
|
||||||
#define SUITE(x) { bddtest_suite(x); }
|
|
||||||
#define TEST(x) { if (!bddtest_test(__FILE__, __LINE__, #x, (x))) return false; }
|
|
||||||
|
|
||||||
#define IT(x) { bddtest_start(x); }
|
|
||||||
#define END_IT { bddtest_end();return true;}
|
|
||||||
|
|
||||||
#define FINISH { return bddtest_summary(); }
|
|
||||||
|
|
||||||
#define IS_TRUE(x) TEST(x)
|
|
||||||
#define IS_FALSE(x) TEST(!(x))
|
|
||||||
#define IS_EQUAL(x,y) TEST(x==y)
|
|
||||||
#define IS_NOT_EQUAL(x,y) TEST(x!=y)
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
#include "Buffer.h"
|
|
||||||
#include "Arduino.h"
|
|
||||||
|
|
||||||
Buffer::Buffer() {
|
|
||||||
this->pos = 0;
|
|
||||||
this->length = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
Buffer::Buffer(uint8_t* buf, size_t size) {
|
|
||||||
this->pos = 0;
|
|
||||||
this->length = 0;
|
|
||||||
this->add(buf,size);
|
|
||||||
}
|
|
||||||
bool Buffer::available() {
|
|
||||||
return this->pos < this->length;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t Buffer::next() {
|
|
||||||
if (this->available()) {
|
|
||||||
return this->buffer[this->pos++];
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Buffer::reset() {
|
|
||||||
this->pos = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Buffer::add(uint8_t* buf, size_t size) {
|
|
||||||
uint16_t i = 0;
|
|
||||||
for (;i<size;i++) {
|
|
||||||
this->buffer[this->length++] = buf[i];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
#ifndef buffer_h
|
|
||||||
#define buffer_h
|
|
||||||
|
|
||||||
#include "Arduino.h"
|
|
||||||
|
|
||||||
class Buffer {
|
|
||||||
private:
|
|
||||||
uint8_t buffer[1024];
|
|
||||||
uint16_t pos;
|
|
||||||
uint16_t length;
|
|
||||||
|
|
||||||
public:
|
|
||||||
Buffer();
|
|
||||||
Buffer(uint8_t* buf, size_t size);
|
|
||||||
|
|
||||||
virtual bool available();
|
|
||||||
virtual uint8_t next();
|
|
||||||
virtual void reset();
|
|
||||||
|
|
||||||
virtual void add(uint8_t* buf, size_t size);
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
#ifndef client_h
|
|
||||||
#define client_h
|
|
||||||
#include "IPAddress.h"
|
|
||||||
|
|
||||||
class Client {
|
|
||||||
public:
|
|
||||||
virtual int connect(IPAddress ip, uint16_t port) =0;
|
|
||||||
virtual int connect(const char *host, uint16_t port) =0;
|
|
||||||
virtual size_t write(uint8_t) =0;
|
|
||||||
virtual size_t write(const uint8_t *buf, size_t size) =0;
|
|
||||||
virtual int available() = 0;
|
|
||||||
virtual int read() = 0;
|
|
||||||
virtual int read(uint8_t *buf, size_t size) = 0;
|
|
||||||
virtual int peek() = 0;
|
|
||||||
virtual void flush() = 0;
|
|
||||||
virtual void stop() = 0;
|
|
||||||
virtual uint8_t connected() = 0;
|
|
||||||
virtual operator bool() = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
|
|
||||||
#include <Arduino.h>
|
|
||||||
#include <IPAddress.h>
|
|
||||||
|
|
||||||
IPAddress::IPAddress()
|
|
||||||
{
|
|
||||||
memset(_address, 0, sizeof(_address));
|
|
||||||
}
|
|
||||||
|
|
||||||
IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet)
|
|
||||||
{
|
|
||||||
_address[0] = first_octet;
|
|
||||||
_address[1] = second_octet;
|
|
||||||
_address[2] = third_octet;
|
|
||||||
_address[3] = fourth_octet;
|
|
||||||
}
|
|
||||||
|
|
||||||
IPAddress::IPAddress(uint32_t address)
|
|
||||||
{
|
|
||||||
memcpy(_address, &address, sizeof(_address));
|
|
||||||
}
|
|
||||||
|
|
||||||
IPAddress::IPAddress(const uint8_t *address)
|
|
||||||
{
|
|
||||||
memcpy(_address, address, sizeof(_address));
|
|
||||||
}
|
|
||||||
|
|
||||||
IPAddress& IPAddress::operator=(const uint8_t *address)
|
|
||||||
{
|
|
||||||
memcpy(_address, address, sizeof(_address));
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
IPAddress& IPAddress::operator=(uint32_t address)
|
|
||||||
{
|
|
||||||
memcpy(_address, (const uint8_t *)&address, sizeof(_address));
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IPAddress::operator==(const uint8_t* addr)
|
|
||||||
{
|
|
||||||
return memcmp(addr, _address, sizeof(_address)) == 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,72 +0,0 @@
|
|||||||
/*
|
|
||||||
*
|
|
||||||
* MIT License:
|
|
||||||
* Copyright (c) 2011 Adrian McEwen
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
* adrianm@mcqn.com 1/1/2011
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef IPAddress_h
|
|
||||||
#define IPAddress_h
|
|
||||||
|
|
||||||
|
|
||||||
// A class to make it easier to handle and pass around IP addresses
|
|
||||||
|
|
||||||
class IPAddress {
|
|
||||||
private:
|
|
||||||
uint8_t _address[4]; // IPv4 address
|
|
||||||
// Access the raw byte array containing the address. Because this returns a pointer
|
|
||||||
// to the internal structure rather than a copy of the address this function should only
|
|
||||||
// be used when you know that the usage of the returned uint8_t* will be transient and not
|
|
||||||
// stored.
|
|
||||||
uint8_t* raw_address() { return _address; };
|
|
||||||
|
|
||||||
public:
|
|
||||||
// Constructors
|
|
||||||
IPAddress();
|
|
||||||
IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet);
|
|
||||||
IPAddress(uint32_t address);
|
|
||||||
IPAddress(const uint8_t *address);
|
|
||||||
|
|
||||||
// Overloaded cast operator to allow IPAddress objects to be used where a pointer
|
|
||||||
// to a four-byte uint8_t array is expected
|
|
||||||
operator uint32_t() { return *((uint32_t*)_address); };
|
|
||||||
bool operator==(const IPAddress& addr) { return (*((uint32_t*)_address)) == (*((uint32_t*)addr._address)); };
|
|
||||||
bool operator==(const uint8_t* addr);
|
|
||||||
|
|
||||||
// Overloaded index operator to allow getting and setting individual octets of the address
|
|
||||||
uint8_t operator[](int index) const { return _address[index]; };
|
|
||||||
uint8_t& operator[](int index) { return _address[index]; };
|
|
||||||
|
|
||||||
// Overloaded copy operators to allow initialisation of IPAddress objects from other types
|
|
||||||
IPAddress& operator=(const uint8_t *address);
|
|
||||||
IPAddress& operator=(uint32_t address);
|
|
||||||
|
|
||||||
|
|
||||||
friend class EthernetClass;
|
|
||||||
friend class UDP;
|
|
||||||
friend class Client;
|
|
||||||
friend class Server;
|
|
||||||
friend class DhcpClass;
|
|
||||||
friend class DNSClient;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
/*
|
|
||||||
Print.h - Base class that provides print() and println()
|
|
||||||
Copyright (c) 2008 David A. Mellis. All right reserved.
|
|
||||||
|
|
||||||
This library is free software; you can redistribute it and/or
|
|
||||||
modify it under the terms of the GNU Lesser General Public
|
|
||||||
License as published by the Free Software Foundation; either
|
|
||||||
version 2.1 of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This library is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
Lesser General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Lesser General Public
|
|
||||||
License along with this library; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef Print_h
|
|
||||||
#define Print_h
|
|
||||||
|
|
||||||
class Print {
|
|
||||||
public:
|
|
||||||
virtual size_t write(uint8_t) = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,153 +0,0 @@
|
|||||||
#include "ShimClient.h"
|
|
||||||
#include "trace.h"
|
|
||||||
#include <iostream>
|
|
||||||
#include <Arduino.h>
|
|
||||||
#include <ctime>
|
|
||||||
|
|
||||||
extern "C" {
|
|
||||||
uint32_t millis(void) {
|
|
||||||
return time(0)*1000;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ShimClient::ShimClient() {
|
|
||||||
this->responseBuffer = new Buffer();
|
|
||||||
this->expectBuffer = new Buffer();
|
|
||||||
this->_allowConnect = true;
|
|
||||||
this->_connected = false;
|
|
||||||
this->_error = false;
|
|
||||||
this->expectAnything = true;
|
|
||||||
this->_received = 0;
|
|
||||||
this->_expectedPort = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int ShimClient::connect(IPAddress ip, uint16_t port) {
|
|
||||||
if (this->_allowConnect) {
|
|
||||||
this->_connected = true;
|
|
||||||
}
|
|
||||||
if (this->_expectedPort !=0) {
|
|
||||||
// if (memcmp(ip,this->_expectedIP,4) != 0) {
|
|
||||||
// TRACE( "ip mismatch\n");
|
|
||||||
// this->_error = true;
|
|
||||||
// }
|
|
||||||
if (port != this->_expectedPort) {
|
|
||||||
TRACE( "port mismatch\n");
|
|
||||||
this->_error = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return this->_connected;
|
|
||||||
}
|
|
||||||
int ShimClient::connect(const char *host, uint16_t port) {
|
|
||||||
if (this->_allowConnect) {
|
|
||||||
this->_connected = true;
|
|
||||||
}
|
|
||||||
if (this->_expectedPort !=0) {
|
|
||||||
if (strcmp(host,this->_expectedHost) != 0) {
|
|
||||||
TRACE( "host mismatch\n");
|
|
||||||
this->_error = true;
|
|
||||||
}
|
|
||||||
if (port != this->_expectedPort) {
|
|
||||||
TRACE( "port mismatch\n");
|
|
||||||
this->_error = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
return this->_connected;
|
|
||||||
}
|
|
||||||
size_t ShimClient::write(uint8_t b) {
|
|
||||||
this->_received += 1;
|
|
||||||
TRACE(std::hex << (unsigned int)b);
|
|
||||||
if (!this->expectAnything) {
|
|
||||||
if (this->expectBuffer->available()) {
|
|
||||||
uint8_t expected = this->expectBuffer->next();
|
|
||||||
if (expected != b) {
|
|
||||||
this->_error = true;
|
|
||||||
TRACE("!=" << (unsigned int)expected);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
this->_error = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
TRACE("\n"<< std::dec);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
size_t ShimClient::write(const uint8_t *buf, size_t size) {
|
|
||||||
this->_received += size;
|
|
||||||
TRACE( "[" << std::dec << (unsigned int)(size) << "] ");
|
|
||||||
uint16_t i=0;
|
|
||||||
for (;i<size;i++) {
|
|
||||||
if (i>0) {
|
|
||||||
TRACE(":");
|
|
||||||
}
|
|
||||||
TRACE(std::hex << (unsigned int)(buf[i]));
|
|
||||||
|
|
||||||
if (!this->expectAnything) {
|
|
||||||
if (this->expectBuffer->available()) {
|
|
||||||
uint8_t expected = this->expectBuffer->next();
|
|
||||||
if (expected != buf[i]) {
|
|
||||||
this->_error = true;
|
|
||||||
TRACE("!=" << (unsigned int)expected);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
this->_error = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
TRACE("\n"<<std::dec);
|
|
||||||
return size;
|
|
||||||
}
|
|
||||||
int ShimClient::available() {
|
|
||||||
return this->responseBuffer->available();
|
|
||||||
}
|
|
||||||
int ShimClient::read() { return this->responseBuffer->next(); }
|
|
||||||
int ShimClient::read(uint8_t *buf, size_t size) {
|
|
||||||
uint16_t i = 0;
|
|
||||||
for (;i<size;i++) {
|
|
||||||
buf[i] = this->read();
|
|
||||||
}
|
|
||||||
return size;
|
|
||||||
}
|
|
||||||
int ShimClient::peek() { return 0; }
|
|
||||||
void ShimClient::flush() {}
|
|
||||||
void ShimClient::stop() {
|
|
||||||
this->setConnected(false);
|
|
||||||
}
|
|
||||||
uint8_t ShimClient::connected() { return this->_connected; }
|
|
||||||
ShimClient::operator bool() { return true; }
|
|
||||||
|
|
||||||
|
|
||||||
ShimClient* ShimClient::respond(uint8_t *buf, size_t size) {
|
|
||||||
this->responseBuffer->add(buf,size);
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
ShimClient* ShimClient::expect(uint8_t *buf, size_t size) {
|
|
||||||
this->expectAnything = false;
|
|
||||||
this->expectBuffer->add(buf,size);
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ShimClient::setConnected(bool b) {
|
|
||||||
this->_connected = b;
|
|
||||||
}
|
|
||||||
void ShimClient::setAllowConnect(bool b) {
|
|
||||||
this->_allowConnect = b;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ShimClient::error() {
|
|
||||||
return this->_error;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint16_t ShimClient::received() {
|
|
||||||
return this->_received;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ShimClient::expectConnect(IPAddress ip, uint16_t port) {
|
|
||||||
this->_expectedIP = ip;
|
|
||||||
this->_expectedPort = port;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ShimClient::expectConnect(const char *host, uint16_t port) {
|
|
||||||
this->_expectedHost = host;
|
|
||||||
this->_expectedPort = port;
|
|
||||||
}
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
#ifndef shimclient_h
|
|
||||||
#define shimclient_h
|
|
||||||
|
|
||||||
#include "Arduino.h"
|
|
||||||
#include "Client.h"
|
|
||||||
#include "IPAddress.h"
|
|
||||||
#include "Buffer.h"
|
|
||||||
|
|
||||||
|
|
||||||
class ShimClient : public Client {
|
|
||||||
private:
|
|
||||||
Buffer* responseBuffer;
|
|
||||||
Buffer* expectBuffer;
|
|
||||||
bool _allowConnect;
|
|
||||||
bool _connected;
|
|
||||||
bool expectAnything;
|
|
||||||
bool _error;
|
|
||||||
uint16_t _received;
|
|
||||||
IPAddress _expectedIP;
|
|
||||||
uint16_t _expectedPort;
|
|
||||||
const char* _expectedHost;
|
|
||||||
|
|
||||||
public:
|
|
||||||
ShimClient();
|
|
||||||
virtual int connect(IPAddress ip, uint16_t port);
|
|
||||||
virtual int connect(const char *host, uint16_t port);
|
|
||||||
virtual size_t write(uint8_t);
|
|
||||||
virtual size_t write(const uint8_t *buf, size_t size);
|
|
||||||
virtual int available();
|
|
||||||
virtual int read();
|
|
||||||
virtual int read(uint8_t *buf, size_t size);
|
|
||||||
virtual int peek();
|
|
||||||
virtual void flush();
|
|
||||||
virtual void stop();
|
|
||||||
virtual uint8_t connected();
|
|
||||||
virtual operator bool();
|
|
||||||
|
|
||||||
virtual ShimClient* respond(uint8_t *buf, size_t size);
|
|
||||||
virtual ShimClient* expect(uint8_t *buf, size_t size);
|
|
||||||
|
|
||||||
virtual void expectConnect(IPAddress ip, uint16_t port);
|
|
||||||
virtual void expectConnect(const char *host, uint16_t port);
|
|
||||||
|
|
||||||
virtual uint16_t received();
|
|
||||||
virtual bool error();
|
|
||||||
|
|
||||||
virtual void setAllowConnect(bool b);
|
|
||||||
virtual void setConnected(bool b);
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
#include "Stream.h"
|
|
||||||
#include "trace.h"
|
|
||||||
#include <iostream>
|
|
||||||
#include <Arduino.h>
|
|
||||||
|
|
||||||
Stream::Stream() {
|
|
||||||
this->expectBuffer = new Buffer();
|
|
||||||
this->_error = false;
|
|
||||||
this->_written = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t Stream::write(uint8_t b) {
|
|
||||||
this->_written++;
|
|
||||||
TRACE(std::hex << (unsigned int)b);
|
|
||||||
if (this->expectBuffer->available()) {
|
|
||||||
uint8_t expected = this->expectBuffer->next();
|
|
||||||
if (expected != b) {
|
|
||||||
this->_error = true;
|
|
||||||
TRACE("!=" << (unsigned int)expected);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
this->_error = true;
|
|
||||||
}
|
|
||||||
TRACE("\n"<< std::dec);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool Stream::error() {
|
|
||||||
return this->_error;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Stream::expect(uint8_t *buf, size_t size) {
|
|
||||||
this->expectBuffer->add(buf,size);
|
|
||||||
}
|
|
||||||
|
|
||||||
uint16_t Stream::length() {
|
|
||||||
return this->_written;
|
|
||||||
}
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
#ifndef Stream_h
|
|
||||||
#define Stream_h
|
|
||||||
|
|
||||||
#include "Arduino.h"
|
|
||||||
#include "Buffer.h"
|
|
||||||
|
|
||||||
class Stream {
|
|
||||||
private:
|
|
||||||
Buffer* expectBuffer;
|
|
||||||
bool _error;
|
|
||||||
uint16_t _written;
|
|
||||||
|
|
||||||
public:
|
|
||||||
Stream();
|
|
||||||
virtual size_t write(uint8_t);
|
|
||||||
|
|
||||||
virtual bool error();
|
|
||||||
virtual void expect(uint8_t *buf, size_t size);
|
|
||||||
virtual uint16_t length();
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
#ifndef trace_h
|
|
||||||
#define trace_h
|
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
#define LOG(x) {std::cout << x << std::flush; }
|
|
||||||
#define TRACE(x) {if (getenv("TRACE")) { std::cout << x << std::flush; }}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,190 +0,0 @@
|
|||||||
#include "PubSubClient.h"
|
|
||||||
#include "ShimClient.h"
|
|
||||||
#include "Buffer.h"
|
|
||||||
#include "BDDTest.h"
|
|
||||||
#include "trace.h"
|
|
||||||
|
|
||||||
|
|
||||||
byte server[] = { 172, 16, 0, 2 };
|
|
||||||
|
|
||||||
void callback(char* topic, byte* payload, unsigned int length) {
|
|
||||||
// handle message arrived
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_publish() {
|
|
||||||
IT("publishes a null-terminated string");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
|
|
||||||
shimClient.expect(publish,16);
|
|
||||||
|
|
||||||
rc = client.publish((char*)"topic",(char*)"payload");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int test_publish_bytes() {
|
|
||||||
IT("publishes a byte array");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte payload[] = { 0x01,0x02,0x03,0x0,0x05 };
|
|
||||||
int length = 5;
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte publish[] = {0x30,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1,0x2,0x3,0x0,0x5};
|
|
||||||
shimClient.expect(publish,14);
|
|
||||||
|
|
||||||
rc = client.publish((char*)"topic",payload,length);
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int test_publish_retained() {
|
|
||||||
IT("publishes retained - 1");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte payload[] = { 0x01,0x02,0x03,0x0,0x05 };
|
|
||||||
int length = 5;
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte publish[] = {0x31,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1,0x2,0x3,0x0,0x5};
|
|
||||||
shimClient.expect(publish,14);
|
|
||||||
|
|
||||||
rc = client.publish((char*)"topic",payload,length,true);
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_publish_retained_2() {
|
|
||||||
IT("publishes retained - 2");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte publish[] = {0x31,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,'A','B','C','D','E'};
|
|
||||||
shimClient.expect(publish,14);
|
|
||||||
|
|
||||||
rc = client.publish((char*)"topic",(char*)"ABCDE",true);
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_publish_not_connected() {
|
|
||||||
IT("publish fails when not connected");
|
|
||||||
ShimClient shimClient;
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
|
|
||||||
int rc = client.publish((char*)"topic",(char*)"payload");
|
|
||||||
IS_FALSE(rc);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_publish_too_long() {
|
|
||||||
IT("publish fails when topic/payload are too long");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
// 0 1 2 3 4 5 6 7 8 9 0 1 2
|
|
||||||
rc = client.publish((char*)"topic",(char*)"123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
|
|
||||||
IS_FALSE(rc);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_publish_P() {
|
|
||||||
IT("publishes using PROGMEM");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte payload[] = { 0x01,0x02,0x03,0x0,0x05 };
|
|
||||||
int length = 5;
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte publish[] = {0x31,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1,0x2,0x3,0x0,0x5};
|
|
||||||
shimClient.expect(publish,14);
|
|
||||||
|
|
||||||
rc = client.publish_P((char*)"topic",payload,length,true);
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
SUITE("Publish");
|
|
||||||
test_publish();
|
|
||||||
test_publish_bytes();
|
|
||||||
test_publish_retained();
|
|
||||||
test_publish_retained_2();
|
|
||||||
test_publish_not_connected();
|
|
||||||
test_publish_too_long();
|
|
||||||
test_publish_P();
|
|
||||||
|
|
||||||
FINISH
|
|
||||||
}
|
|
||||||
@ -1,279 +0,0 @@
|
|||||||
#include "PubSubClient.h"
|
|
||||||
#include "ShimClient.h"
|
|
||||||
#include "Buffer.h"
|
|
||||||
#include "BDDTest.h"
|
|
||||||
#include "trace.h"
|
|
||||||
|
|
||||||
|
|
||||||
byte server[] = { 172, 16, 0, 2 };
|
|
||||||
|
|
||||||
bool callback_called = false;
|
|
||||||
char lastTopic[1024];
|
|
||||||
char lastPayload[1024];
|
|
||||||
unsigned int lastLength;
|
|
||||||
|
|
||||||
void reset_callback() {
|
|
||||||
callback_called = false;
|
|
||||||
lastTopic[0] = '\0';
|
|
||||||
lastPayload[0] = '\0';
|
|
||||||
lastLength = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void callback(char* topic, byte* payload, unsigned int length) {
|
|
||||||
callback_called = true;
|
|
||||||
strcpy(lastTopic,topic);
|
|
||||||
memcpy(lastPayload,payload,length);
|
|
||||||
lastLength = length;
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_receive_callback() {
|
|
||||||
IT("receives a callback message");
|
|
||||||
reset_callback();
|
|
||||||
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
|
|
||||||
shimClient.respond(publish,16);
|
|
||||||
|
|
||||||
rc = client.loop();
|
|
||||||
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
IS_TRUE(callback_called);
|
|
||||||
IS_TRUE(strcmp(lastTopic,"topic")==0);
|
|
||||||
IS_TRUE(memcmp(lastPayload,"payload",7)==0);
|
|
||||||
IS_TRUE(lastLength == 7);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_receive_stream() {
|
|
||||||
IT("receives a streamed callback message");
|
|
||||||
reset_callback();
|
|
||||||
|
|
||||||
Stream stream;
|
|
||||||
stream.expect((uint8_t*)"payload",7);
|
|
||||||
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient, stream);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
|
|
||||||
shimClient.respond(publish,16);
|
|
||||||
|
|
||||||
rc = client.loop();
|
|
||||||
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
IS_TRUE(callback_called);
|
|
||||||
IS_TRUE(strcmp(lastTopic,"topic")==0);
|
|
||||||
IS_TRUE(lastLength == 7);
|
|
||||||
|
|
||||||
IS_FALSE(stream.error());
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_receive_max_sized_message() {
|
|
||||||
IT("receives an max-sized message");
|
|
||||||
reset_callback();
|
|
||||||
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
int length = MQTT_MAX_PACKET_SIZE;
|
|
||||||
byte publish[] = {0x30,length-2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
|
|
||||||
byte bigPublish[length];
|
|
||||||
memset(bigPublish,'A',length);
|
|
||||||
bigPublish[length] = 'B';
|
|
||||||
memcpy(bigPublish,publish,16);
|
|
||||||
shimClient.respond(bigPublish,length);
|
|
||||||
|
|
||||||
rc = client.loop();
|
|
||||||
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
IS_TRUE(callback_called);
|
|
||||||
IS_TRUE(strcmp(lastTopic,"topic")==0);
|
|
||||||
IS_TRUE(lastLength == length-9);
|
|
||||||
IS_TRUE(memcmp(lastPayload,bigPublish+9,lastLength)==0);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_receive_oversized_message() {
|
|
||||||
IT("drops an oversized message");
|
|
||||||
reset_callback();
|
|
||||||
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
int length = MQTT_MAX_PACKET_SIZE+1;
|
|
||||||
byte publish[] = {0x30,length-2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
|
|
||||||
byte bigPublish[length];
|
|
||||||
memset(bigPublish,'A',length);
|
|
||||||
bigPublish[length] = 'B';
|
|
||||||
memcpy(bigPublish,publish,16);
|
|
||||||
shimClient.respond(bigPublish,length);
|
|
||||||
|
|
||||||
rc = client.loop();
|
|
||||||
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
IS_FALSE(callback_called);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_drop_invalid_remaining_length_message() {
|
|
||||||
IT("drops invalid remaining length message");
|
|
||||||
reset_callback();
|
|
||||||
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte publish[] = {0x30,0x92,0x92,0x92,0x92,0x01,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
|
|
||||||
shimClient.respond(publish,20);
|
|
||||||
|
|
||||||
rc = client.loop();
|
|
||||||
|
|
||||||
IS_FALSE(rc);
|
|
||||||
|
|
||||||
IS_FALSE(callback_called);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int test_receive_oversized_stream_message() {
|
|
||||||
IT("drops an oversized message");
|
|
||||||
reset_callback();
|
|
||||||
|
|
||||||
Stream stream;
|
|
||||||
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient, stream);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
int length = MQTT_MAX_PACKET_SIZE+1;
|
|
||||||
byte publish[] = {0x30,length-2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
|
|
||||||
|
|
||||||
byte bigPublish[length];
|
|
||||||
memset(bigPublish,'A',length);
|
|
||||||
bigPublish[length] = 'B';
|
|
||||||
memcpy(bigPublish,publish,16);
|
|
||||||
|
|
||||||
shimClient.respond(bigPublish,length);
|
|
||||||
stream.expect(bigPublish+9,length-9);
|
|
||||||
|
|
||||||
rc = client.loop();
|
|
||||||
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
IS_TRUE(callback_called);
|
|
||||||
IS_TRUE(strcmp(lastTopic,"topic")==0);
|
|
||||||
IS_TRUE(lastLength == length-9);
|
|
||||||
|
|
||||||
IS_FALSE(stream.error());
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_receive_qos1() {
|
|
||||||
IT("receives a qos1 message");
|
|
||||||
reset_callback();
|
|
||||||
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte publish[] = {0x32,0x10,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x12,0x34,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
|
|
||||||
shimClient.respond(publish,18);
|
|
||||||
|
|
||||||
byte puback[] = {0x40,0x2,0x12,0x34};
|
|
||||||
shimClient.expect(puback,4);
|
|
||||||
|
|
||||||
rc = client.loop();
|
|
||||||
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
IS_TRUE(callback_called);
|
|
||||||
IS_TRUE(strcmp(lastTopic,"topic")==0);
|
|
||||||
IS_TRUE(memcmp(lastPayload,"payload",7)==0);
|
|
||||||
IS_TRUE(lastLength == 7);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
SUITE("Receive");
|
|
||||||
test_receive_callback();
|
|
||||||
test_receive_stream();
|
|
||||||
test_receive_max_sized_message();
|
|
||||||
test_drop_invalid_remaining_length_message();
|
|
||||||
test_receive_oversized_message();
|
|
||||||
test_receive_oversized_stream_message();
|
|
||||||
test_receive_qos1();
|
|
||||||
|
|
||||||
FINISH
|
|
||||||
}
|
|
||||||
@ -1,177 +0,0 @@
|
|||||||
#include "PubSubClient.h"
|
|
||||||
#include "ShimClient.h"
|
|
||||||
#include "Buffer.h"
|
|
||||||
#include "BDDTest.h"
|
|
||||||
#include "trace.h"
|
|
||||||
|
|
||||||
|
|
||||||
byte server[] = { 172, 16, 0, 2 };
|
|
||||||
|
|
||||||
void callback(char* topic, byte* payload, unsigned int length) {
|
|
||||||
// handle message arrived
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_subscribe_no_qos() {
|
|
||||||
IT("subscribe without qos defaults to 0");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte subscribe[] = { 0x82,0xa,0x0,0x2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x0 };
|
|
||||||
shimClient.expect(subscribe,12);
|
|
||||||
byte suback[] = { 0x90,0x3,0x0,0x2,0x0 };
|
|
||||||
shimClient.respond(suback,5);
|
|
||||||
|
|
||||||
rc = client.subscribe((char*)"topic");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_subscribe_qos_1() {
|
|
||||||
IT("subscribes qos 1");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte subscribe[] = { 0x82,0xa,0x0,0x2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1 };
|
|
||||||
shimClient.expect(subscribe,12);
|
|
||||||
byte suback[] = { 0x90,0x3,0x0,0x2,0x1 };
|
|
||||||
shimClient.respond(suback,5);
|
|
||||||
|
|
||||||
rc = client.subscribe((char*)"topic",1);
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_subscribe_not_connected() {
|
|
||||||
IT("subscribe fails when not connected");
|
|
||||||
ShimClient shimClient;
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
|
|
||||||
int rc = client.subscribe((char*)"topic");
|
|
||||||
IS_FALSE(rc);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_subscribe_invalid_qos() {
|
|
||||||
IT("subscribe fails with invalid qos values");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
rc = client.subscribe((char*)"topic",2);
|
|
||||||
IS_FALSE(rc);
|
|
||||||
rc = client.subscribe((char*)"topic",254);
|
|
||||||
IS_FALSE(rc);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_subscribe_too_long() {
|
|
||||||
IT("subscribe fails with too long topic");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
// max length should be allowed
|
|
||||||
// 0 1 2 3 4 5 6 7 8 9 0 1 2
|
|
||||||
rc = client.subscribe((char*)"12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
// 0 1 2 3 4 5 6 7 8 9 0 1 2
|
|
||||||
rc = client.subscribe((char*)"123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
|
|
||||||
IS_FALSE(rc);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int test_unsubscribe() {
|
|
||||||
IT("unsubscribes");
|
|
||||||
ShimClient shimClient;
|
|
||||||
shimClient.setAllowConnect(true);
|
|
||||||
|
|
||||||
byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
|
|
||||||
shimClient.respond(connack,4);
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
int rc = client.connect((char*)"client_test1");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
byte unsubscribe[] = { 0xA2,0x9,0x0,0x2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63 };
|
|
||||||
shimClient.expect(unsubscribe,12);
|
|
||||||
byte unsuback[] = { 0xB0,0x2,0x0,0x2 };
|
|
||||||
shimClient.respond(unsuback,4);
|
|
||||||
|
|
||||||
rc = client.unsubscribe((char*)"topic");
|
|
||||||
IS_TRUE(rc);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int test_unsubscribe_not_connected() {
|
|
||||||
IT("unsubscribe fails when not connected");
|
|
||||||
ShimClient shimClient;
|
|
||||||
|
|
||||||
PubSubClient client(server, 1883, callback, shimClient);
|
|
||||||
|
|
||||||
int rc = client.unsubscribe((char*)"topic");
|
|
||||||
IS_FALSE(rc);
|
|
||||||
|
|
||||||
IS_FALSE(shimClient.error());
|
|
||||||
|
|
||||||
END_IT
|
|
||||||
}
|
|
||||||
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
SUITE("Subscribe");
|
|
||||||
test_subscribe_no_qos();
|
|
||||||
test_subscribe_qos_1();
|
|
||||||
test_subscribe_not_connected();
|
|
||||||
test_subscribe_invalid_qos();
|
|
||||||
test_subscribe_too_long();
|
|
||||||
test_unsubscribe();
|
|
||||||
test_unsubscribe_not_connected();
|
|
||||||
FINISH
|
|
||||||
}
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
import unittest
|
|
||||||
import settings
|
|
||||||
import time
|
|
||||||
import mosquitto
|
|
||||||
|
|
||||||
|
|
||||||
def on_message(mosq, obj, msg):
|
|
||||||
obj.message_queue.append(msg)
|
|
||||||
|
|
||||||
|
|
||||||
class mqtt_basic(unittest.TestCase):
|
|
||||||
|
|
||||||
message_queue = []
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def setUpClass(self):
|
|
||||||
self.client = mosquitto.Mosquitto("pubsubclient_ut", clean_session=True, obj=self)
|
|
||||||
self.client.connect(settings.server_ip)
|
|
||||||
self.client.on_message = on_message
|
|
||||||
self.client.subscribe("outTopic", 0)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def tearDownClass(self):
|
|
||||||
self.client.disconnect()
|
|
||||||
|
|
||||||
def test_one(self):
|
|
||||||
i = 30
|
|
||||||
while len(self.message_queue) == 0 and i > 0:
|
|
||||||
self.client.loop()
|
|
||||||
time.sleep(0.5)
|
|
||||||
i -= 1
|
|
||||||
self.assertTrue(i > 0, "message receive timed-out")
|
|
||||||
self.assertEqual(len(self.message_queue), 1, "unexpected number of messages received")
|
|
||||||
msg = self.message_queue[0]
|
|
||||||
self.assertEqual(msg.mid, 0, "message id not 0")
|
|
||||||
self.assertEqual(msg.topic, "outTopic", "message topic incorrect")
|
|
||||||
self.assertEqual(msg.payload, "hello world")
|
|
||||||
self.assertEqual(msg.qos, 0, "message qos not 0")
|
|
||||||
self.assertEqual(msg.retain, False, "message retain flag incorrect")
|
|
||||||
@ -1,59 +0,0 @@
|
|||||||
import unittest
|
|
||||||
import settings
|
|
||||||
import time
|
|
||||||
import mosquitto
|
|
||||||
|
|
||||||
|
|
||||||
def on_message(mosq, obj, msg):
|
|
||||||
obj.message_queue.append(msg)
|
|
||||||
|
|
||||||
|
|
||||||
class mqtt_publish_in_callback(unittest.TestCase):
|
|
||||||
|
|
||||||
message_queue = []
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def setUpClass(self):
|
|
||||||
self.client = mosquitto.Mosquitto("pubsubclient_ut", clean_session=True, obj=self)
|
|
||||||
self.client.connect(settings.server_ip)
|
|
||||||
self.client.on_message = on_message
|
|
||||||
self.client.subscribe("outTopic", 0)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def tearDownClass(self):
|
|
||||||
self.client.disconnect()
|
|
||||||
|
|
||||||
def test_connect(self):
|
|
||||||
i = 30
|
|
||||||
while len(self.message_queue) == 0 and i > 0:
|
|
||||||
self.client.loop()
|
|
||||||
time.sleep(0.5)
|
|
||||||
i -= 1
|
|
||||||
self.assertTrue(i > 0, "message receive timed-out")
|
|
||||||
self.assertEqual(len(self.message_queue), 1, "unexpected number of messages received")
|
|
||||||
msg = self.message_queue.pop(0)
|
|
||||||
self.assertEqual(msg.mid, 0, "message id not 0")
|
|
||||||
self.assertEqual(msg.topic, "outTopic", "message topic incorrect")
|
|
||||||
self.assertEqual(msg.payload, "hello world")
|
|
||||||
self.assertEqual(msg.qos, 0, "message qos not 0")
|
|
||||||
self.assertEqual(msg.retain, False, "message retain flag incorrect")
|
|
||||||
|
|
||||||
def test_publish(self):
|
|
||||||
self.assertEqual(len(self.message_queue), 0, "message queue not empty")
|
|
||||||
payload = "abcdefghij"
|
|
||||||
self.client.publish("inTopic", payload)
|
|
||||||
|
|
||||||
i = 30
|
|
||||||
while len(self.message_queue) == 0 and i > 0:
|
|
||||||
self.client.loop()
|
|
||||||
time.sleep(0.5)
|
|
||||||
i -= 1
|
|
||||||
|
|
||||||
self.assertTrue(i > 0, "message receive timed-out")
|
|
||||||
self.assertEqual(len(self.message_queue), 1, "unexpected number of messages received")
|
|
||||||
msg = self.message_queue.pop(0)
|
|
||||||
self.assertEqual(msg.mid, 0, "message id not 0")
|
|
||||||
self.assertEqual(msg.topic, "outTopic", "message topic incorrect")
|
|
||||||
self.assertEqual(msg.payload, payload)
|
|
||||||
self.assertEqual(msg.qos, 0, "message qos not 0")
|
|
||||||
self.assertEqual(msg.retain, False, "message retain flag incorrect")
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
server_ip = "172.16.0.2"
|
|
||||||
arduino_ip = "172.16.0.100"
|
|
||||||
@ -1,181 +0,0 @@
|
|||||||
#!/usr/bin/env python
|
|
||||||
import os
|
|
||||||
import os.path
|
|
||||||
import sys
|
|
||||||
import shutil
|
|
||||||
from subprocess import call
|
|
||||||
import importlib
|
|
||||||
import unittest
|
|
||||||
import re
|
|
||||||
|
|
||||||
from testcases import settings
|
|
||||||
|
|
||||||
|
|
||||||
class Workspace(object):
|
|
||||||
|
|
||||||
def __init__(self):
|
|
||||||
self.root_dir = os.getcwd()
|
|
||||||
self.build_dir = os.path.join(self.root_dir, "tmpbin")
|
|
||||||
self.log_dir = os.path.join(self.root_dir, "logs")
|
|
||||||
self.tests_dir = os.path.join(self.root_dir, "testcases")
|
|
||||||
self.examples_dir = os.path.join(self.root_dir, "../PubSubClient/examples")
|
|
||||||
self.examples = []
|
|
||||||
self.tests = []
|
|
||||||
if not os.path.isdir("../PubSubClient"):
|
|
||||||
raise Exception("Cannot find PubSubClient library")
|
|
||||||
try:
|
|
||||||
return __import__('ino')
|
|
||||||
except ImportError:
|
|
||||||
raise Exception("ino tool not installed")
|
|
||||||
|
|
||||||
def init(self):
|
|
||||||
if os.path.isdir(self.build_dir):
|
|
||||||
shutil.rmtree(self.build_dir)
|
|
||||||
os.mkdir(self.build_dir)
|
|
||||||
if os.path.isdir(self.log_dir):
|
|
||||||
shutil.rmtree(self.log_dir)
|
|
||||||
os.mkdir(self.log_dir)
|
|
||||||
|
|
||||||
os.chdir(self.build_dir)
|
|
||||||
call(["ino", "init"])
|
|
||||||
|
|
||||||
shutil.copytree("../../PubSubClient", "lib/PubSubClient")
|
|
||||||
|
|
||||||
filenames = []
|
|
||||||
for root, dirs, files in os.walk(self.examples_dir):
|
|
||||||
filenames += [os.path.join(root, f) for f in files if f.endswith(".ino")]
|
|
||||||
filenames.sort()
|
|
||||||
for e in filenames:
|
|
||||||
self.examples.append(Sketch(self, e))
|
|
||||||
|
|
||||||
filenames = []
|
|
||||||
for root, dirs, files in os.walk(self.tests_dir):
|
|
||||||
filenames += [os.path.join(root, f) for f in files if f.endswith(".ino")]
|
|
||||||
filenames.sort()
|
|
||||||
for e in filenames:
|
|
||||||
self.tests.append(Sketch(self, e))
|
|
||||||
|
|
||||||
def clean(self):
|
|
||||||
shutil.rmtree(self.build_dir)
|
|
||||||
|
|
||||||
|
|
||||||
class Sketch(object):
|
|
||||||
def __init__(self, wksp, fn):
|
|
||||||
self.w = wksp
|
|
||||||
self.filename = fn
|
|
||||||
self.basename = os.path.basename(self.filename)
|
|
||||||
self.build_log = os.path.join(self.w.log_dir, "%s.log" % (os.path.basename(self.filename),))
|
|
||||||
self.build_err_log = os.path.join(self.w.log_dir, "%s.err.log" % (os.path.basename(self.filename),))
|
|
||||||
self.build_upload_log = os.path.join(self.w.log_dir, "%s.upload.log" % (os.path.basename(self.filename),))
|
|
||||||
|
|
||||||
def build(self):
|
|
||||||
sys.stdout.write(" Build: ")
|
|
||||||
sys.stdout.flush()
|
|
||||||
|
|
||||||
# Copy sketch over, replacing IP addresses as necessary
|
|
||||||
fin = open(self.filename, "r")
|
|
||||||
lines = fin.readlines()
|
|
||||||
fin.close()
|
|
||||||
fout = open(os.path.join(self.w.build_dir, "src", "sketch.ino"), "w")
|
|
||||||
for l in lines:
|
|
||||||
if re.match(r"^byte server\[\] = {", l):
|
|
||||||
fout.write("byte server[] = { %s };\n" % (settings.server_ip.replace(".", ", "),))
|
|
||||||
elif re.match(r"^byte ip\[\] = {", l):
|
|
||||||
fout.write("byte ip[] = { %s };\n" % (settings.arduino_ip.replace(".", ", "),))
|
|
||||||
else:
|
|
||||||
fout.write(l)
|
|
||||||
fout.flush()
|
|
||||||
fout.close()
|
|
||||||
|
|
||||||
# Run build
|
|
||||||
fout = open(self.build_log, "w")
|
|
||||||
ferr = open(self.build_err_log, "w")
|
|
||||||
rc = call(["ino", "build"], stdout=fout, stderr=ferr)
|
|
||||||
fout.close()
|
|
||||||
ferr.close()
|
|
||||||
if rc == 0:
|
|
||||||
sys.stdout.write("pass")
|
|
||||||
sys.stdout.write("\n")
|
|
||||||
return True
|
|
||||||
else:
|
|
||||||
sys.stdout.write("fail")
|
|
||||||
sys.stdout.write("\n")
|
|
||||||
with open(self.build_err_log) as f:
|
|
||||||
for line in f:
|
|
||||||
print(" " + line)
|
|
||||||
return False
|
|
||||||
|
|
||||||
def upload(self):
|
|
||||||
sys.stdout.write(" Upload: ")
|
|
||||||
sys.stdout.flush()
|
|
||||||
fout = open(self.build_upload_log, "w")
|
|
||||||
rc = call(["ino", "upload"], stdout=fout, stderr=fout)
|
|
||||||
fout.close()
|
|
||||||
if rc == 0:
|
|
||||||
sys.stdout.write("pass")
|
|
||||||
sys.stdout.write("\n")
|
|
||||||
return True
|
|
||||||
else:
|
|
||||||
sys.stdout.write("fail")
|
|
||||||
sys.stdout.write("\n")
|
|
||||||
with open(self.build_upload_log) as f:
|
|
||||||
for line in f:
|
|
||||||
print(" " + line)
|
|
||||||
return False
|
|
||||||
|
|
||||||
def test(self):
|
|
||||||
# import the matching test case, if it exists
|
|
||||||
try:
|
|
||||||
basename = os.path.basename(self.filename)[:-4]
|
|
||||||
i = importlib.import_module("testcases." + basename)
|
|
||||||
except:
|
|
||||||
sys.stdout.write(" Test: no tests found")
|
|
||||||
sys.stdout.write("\n")
|
|
||||||
return
|
|
||||||
c = getattr(i, basename)
|
|
||||||
|
|
||||||
testmethods = [m for m in dir(c) if m.startswith("test_")]
|
|
||||||
testmethods.sort()
|
|
||||||
tests = []
|
|
||||||
for m in testmethods:
|
|
||||||
tests.append(c(m))
|
|
||||||
|
|
||||||
result = unittest.TestResult()
|
|
||||||
c.setUpClass()
|
|
||||||
if self.upload():
|
|
||||||
sys.stdout.write(" Test: ")
|
|
||||||
sys.stdout.flush()
|
|
||||||
for t in tests:
|
|
||||||
t.run(result)
|
|
||||||
print(str(result.testsRun - len(result.failures) - len(result.errors)) + "/" + str(result.testsRun))
|
|
||||||
if not result.wasSuccessful():
|
|
||||||
if len(result.failures) > 0:
|
|
||||||
for f in result.failures:
|
|
||||||
print("-- " + str(f[0]))
|
|
||||||
print(f[1])
|
|
||||||
if len(result.errors) > 0:
|
|
||||||
print(" Errors:")
|
|
||||||
for f in result.errors:
|
|
||||||
print("-- " + str(f[0]))
|
|
||||||
print(f[1])
|
|
||||||
c.tearDownClass()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
run_tests = True
|
|
||||||
|
|
||||||
w = Workspace()
|
|
||||||
w.init()
|
|
||||||
|
|
||||||
for e in w.examples:
|
|
||||||
print("--------------------------------------")
|
|
||||||
print("[" + e.basename + "]")
|
|
||||||
if e.build() and run_tests:
|
|
||||||
e.test()
|
|
||||||
for e in w.tests:
|
|
||||||
print("--------------------------------------")
|
|
||||||
print("[" + e.basename + "]")
|
|
||||||
if e.build() and run_tests:
|
|
||||||
e.test()
|
|
||||||
|
|
||||||
w.clean()
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
# TasmotaSerial
|
|
||||||
|
|
||||||
Implementation of software serial with hardware serial fallback library for the ESP8266
|
|
||||||
Implementation of dual UART hardware serial for the ESP32
|
|
||||||
|
|
||||||
Allows for several instances to be active at the same time.
|
|
||||||
|
|
||||||
Please note that due to the fact that the ESP always have other activities ongoing, there will be some inexactness in interrupt timings. This may lead to bit errors when having heavy data traffic.
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
|
|
||||||
#include <TasmotaSerial.h>
|
|
||||||
|
|
||||||
TasmotaSerial swSer(14, 12);
|
|
||||||
|
|
||||||
void setup() {
|
|
||||||
Serial.begin(115200);
|
|
||||||
swSer.begin();
|
|
||||||
|
|
||||||
Serial.println("\nTasmota serial test started");
|
|
||||||
|
|
||||||
for (char ch = ' '; ch <= 'z'; ch++) {
|
|
||||||
swSer.write(ch);
|
|
||||||
}
|
|
||||||
swSer.println("");
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop() {
|
|
||||||
while (swSer.available() > 0) {
|
|
||||||
Serial.write(swSer.read());
|
|
||||||
}
|
|
||||||
while (Serial.available() > 0) {
|
|
||||||
swSer.write(Serial.read());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
#######################################
|
|
||||||
# Syntax Coloring Map for TasmotaSerial
|
|
||||||
# (esp8266 and esp32)
|
|
||||||
#######################################
|
|
||||||
|
|
||||||
#######################################
|
|
||||||
# Datatypes (KEYWORD1)
|
|
||||||
#######################################
|
|
||||||
|
|
||||||
TasmotaSerial KEYWORD1
|
|
||||||
|
|
||||||
#######################################
|
|
||||||
# Methods and Functions (KEYWORD2)
|
|
||||||
#######################################
|
|
||||||
|
|
||||||
begin KEYWORD2
|
|
||||||
hardwareSerial KEYWORD2
|
|
||||||
read KEYWORD2
|
|
||||||
write KEYWORD2
|
|
||||||
available KEYWORD2
|
|
||||||
flush KEYWORD2
|
|
||||||
peek KEYWORD2
|
|
||||||
|
|
||||||
#######################################
|
|
||||||
# Constants (LITERAL1)
|
|
||||||
#######################################
|
|
||||||
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "TasmotaSerial",
|
|
||||||
"version": "3.1.0",
|
|
||||||
"keywords": [
|
|
||||||
"serial", "io", "TasmotaSerial"
|
|
||||||
],
|
|
||||||
"description": "Implementation of software serial with hardware serial fallback for ESP8266 and ESP32.",
|
|
||||||
"repository":
|
|
||||||
{
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/arendst/Tasmota/lib/TasmotaSerial"
|
|
||||||
},
|
|
||||||
"frameworks": "arduino",
|
|
||||||
"platforms": [
|
|
||||||
"espressif8266", "espressif32"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
name=TasmotaSerial
|
|
||||||
version=3.1.0
|
|
||||||
author=Theo Arends
|
|
||||||
maintainer=Theo Arends <theo@arends.com>
|
|
||||||
sentence=Implementation of software serial with hardware serial fallback for ESP8266 and ESP32.
|
|
||||||
paragraph=
|
|
||||||
category=Signal Input/Output
|
|
||||||
url=
|
|
||||||
architectures=esp8266,esp32
|
|
||||||
@ -1,382 +0,0 @@
|
|||||||
/*
|
|
||||||
TasmotaSerial.cpp - Implementation of software serial with hardware serial fallback for Tasmota
|
|
||||||
|
|
||||||
Copyright (C) 2020 Theo Arends
|
|
||||||
|
|
||||||
This library is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <Arduino.h>
|
|
||||||
|
|
||||||
// The Arduino standard GPIO routines are not enough,
|
|
||||||
// must use some from the Espressif SDK as well
|
|
||||||
extern "C" {
|
|
||||||
#include "gpio.h"
|
|
||||||
}
|
|
||||||
|
|
||||||
#include <TasmotaSerial.h>
|
|
||||||
|
|
||||||
#ifdef ESP8266
|
|
||||||
|
|
||||||
void ICACHE_RAM_ATTR callRxRead(void *self) { ((TasmotaSerial*)self)->rxRead(); };
|
|
||||||
|
|
||||||
// As the Arduino attachInterrupt has no parameter, lists of objects
|
|
||||||
// and callbacks corresponding to each possible GPIO pins have to be defined
|
|
||||||
TasmotaSerial *tms_obj_list[16];
|
|
||||||
|
|
||||||
#else // ESP32
|
|
||||||
|
|
||||||
static int tasmota_serial_index = 2; // Allow UART2 and UART1 only
|
|
||||||
|
|
||||||
#endif // ESP8266
|
|
||||||
|
|
||||||
TasmotaSerial::TasmotaSerial(int receive_pin, int transmit_pin, int hardware_fallback, int nwmode, int buffer_size) {
|
|
||||||
m_valid = false;
|
|
||||||
m_hardserial = false;
|
|
||||||
m_hardswap = false;
|
|
||||||
m_stop_bits = 1;
|
|
||||||
m_nwmode = nwmode;
|
|
||||||
serial_buffer_size = buffer_size;
|
|
||||||
m_rx_pin = receive_pin;
|
|
||||||
m_tx_pin = transmit_pin;
|
|
||||||
m_in_pos = m_out_pos = 0;
|
|
||||||
#ifdef ESP8266
|
|
||||||
if (!((isValidGPIOpin(receive_pin)) && (isValidGPIOpin(transmit_pin) || transmit_pin == 16))) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (hardware_fallback && (((3 == m_rx_pin) && (1 == m_tx_pin)) || ((3 == m_rx_pin) && (-1 == m_tx_pin)) || ((-1 == m_rx_pin) && (1 == m_tx_pin)))) {
|
|
||||||
m_hardserial = true;
|
|
||||||
}
|
|
||||||
else if ((2 == hardware_fallback) && (((13 == m_rx_pin) && (15 == m_tx_pin)) || ((13 == m_rx_pin) && (-1 == m_tx_pin)) || ((-1 == m_rx_pin) && (15 == m_tx_pin)))) {
|
|
||||||
m_hardserial = true;
|
|
||||||
m_hardswap = true;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if (m_rx_pin > -1) {
|
|
||||||
m_buffer = (uint8_t*)malloc(serial_buffer_size);
|
|
||||||
if (m_buffer == NULL) return;
|
|
||||||
// Use getCycleCount() loop to get as exact timing as possible
|
|
||||||
m_bit_time = ESP.getCpuFreqMHz() * 1000000 / TM_SERIAL_BAUDRATE;
|
|
||||||
m_bit_start_time = m_bit_time + m_bit_time/3 - 500; // pre-compute first wait
|
|
||||||
pinMode(m_rx_pin, INPUT);
|
|
||||||
tms_obj_list[m_rx_pin] = this;
|
|
||||||
attachInterruptArg(m_rx_pin, callRxRead, this, (m_nwmode) ? CHANGE : FALLING);
|
|
||||||
}
|
|
||||||
if (m_tx_pin > -1) {
|
|
||||||
pinMode(m_tx_pin, OUTPUT);
|
|
||||||
digitalWrite(m_tx_pin, HIGH);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#else // ESP32
|
|
||||||
if (transmit_pin > 33) { return; } // GPIO34 - GPIO39 are Input only
|
|
||||||
m_hardserial = true;
|
|
||||||
#endif // ESP8266 - ESP32
|
|
||||||
m_valid = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
TasmotaSerial::~TasmotaSerial() {
|
|
||||||
#ifdef ESP8266
|
|
||||||
if (!m_hardserial) {
|
|
||||||
if (m_rx_pin > -1) {
|
|
||||||
detachInterrupt(m_rx_pin);
|
|
||||||
tms_obj_list[m_rx_pin] = NULL;
|
|
||||||
if (m_buffer) {
|
|
||||||
free(m_buffer);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif // ESP8266
|
|
||||||
}
|
|
||||||
|
|
||||||
bool TasmotaSerial::isValidGPIOpin(int pin) {
|
|
||||||
return (pin >= -1 && pin <= 5) || (pin >= 12 && pin <= 15);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool TasmotaSerial::begin(long speed, int stop_bits) {
|
|
||||||
m_stop_bits = ((stop_bits -1) &1) +1;
|
|
||||||
if (m_hardserial) {
|
|
||||||
#ifdef ESP8266
|
|
||||||
Serial.flush();
|
|
||||||
if (2 == m_stop_bits) {
|
|
||||||
Serial.begin(speed, SERIAL_8N2);
|
|
||||||
} else {
|
|
||||||
Serial.begin(speed, SERIAL_8N1);
|
|
||||||
}
|
|
||||||
if (m_hardswap) {
|
|
||||||
Serial.swap();
|
|
||||||
}
|
|
||||||
#else // ESP32
|
|
||||||
if (tasmota_serial_index > 0) { // We only support UART1 and UART2 and keep UART0 for debugging
|
|
||||||
m_uart = tasmota_serial_index;
|
|
||||||
tasmota_serial_index--;
|
|
||||||
TSerial = new HardwareSerial(m_uart);
|
|
||||||
if (serial_buffer_size > 256) {
|
|
||||||
TSerial->setRxBufferSize(serial_buffer_size);
|
|
||||||
}
|
|
||||||
if (2 == m_stop_bits) {
|
|
||||||
TSerial->begin(speed, SERIAL_8N2, m_rx_pin, m_tx_pin);
|
|
||||||
} else {
|
|
||||||
TSerial->begin(speed, SERIAL_8N1, m_rx_pin, m_tx_pin);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
m_valid = false;
|
|
||||||
}
|
|
||||||
// Serial.printf("TSR: Using UART%d\n", m_uart);
|
|
||||||
#endif // ESP8266 - ESP32
|
|
||||||
} else {
|
|
||||||
// Use getCycleCount() loop to get as exact timing as possible
|
|
||||||
m_bit_time = ESP.getCpuFreqMHz() * 1000000 / speed;
|
|
||||||
m_bit_start_time = m_bit_time + m_bit_time/3 - (ESP.getCpuFreqMHz() > 120 ? 700 : 500); // pre-compute first wait
|
|
||||||
m_high_speed = (speed >= 9600);
|
|
||||||
m_very_high_speed = (speed >= 50000);
|
|
||||||
}
|
|
||||||
return m_valid;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool TasmotaSerial::begin() {
|
|
||||||
return begin(TM_SERIAL_BAUDRATE);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool TasmotaSerial::hardwareSerial() {
|
|
||||||
#ifdef ESP8266
|
|
||||||
return m_hardserial;
|
|
||||||
#else
|
|
||||||
return false; // On ESP32 do not mess with Serial0 buffers
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void TasmotaSerial::flush() {
|
|
||||||
if (m_hardserial) {
|
|
||||||
#ifdef ESP8266
|
|
||||||
Serial.flush();
|
|
||||||
#else
|
|
||||||
TSerial->flush();
|
|
||||||
#endif
|
|
||||||
} else {
|
|
||||||
m_in_pos = m_out_pos = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int TasmotaSerial::peek() {
|
|
||||||
if (m_hardserial) {
|
|
||||||
#ifdef ESP8266
|
|
||||||
return Serial.peek();
|
|
||||||
#else
|
|
||||||
return TSerial->peek();
|
|
||||||
#endif
|
|
||||||
} else {
|
|
||||||
if ((-1 == m_rx_pin) || (m_in_pos == m_out_pos)) return -1;
|
|
||||||
return m_buffer[m_out_pos];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int TasmotaSerial::read() {
|
|
||||||
if (m_hardserial) {
|
|
||||||
#ifdef ESP8266
|
|
||||||
return Serial.read();
|
|
||||||
#else
|
|
||||||
return TSerial->read();
|
|
||||||
#endif
|
|
||||||
} else {
|
|
||||||
if ((-1 == m_rx_pin) || (m_in_pos == m_out_pos)) return -1;
|
|
||||||
uint32_t ch = m_buffer[m_out_pos];
|
|
||||||
m_out_pos = (m_out_pos +1) % serial_buffer_size;
|
|
||||||
return ch;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int TasmotaSerial::available() {
|
|
||||||
if (m_hardserial) {
|
|
||||||
#ifdef ESP8266
|
|
||||||
return Serial.available();
|
|
||||||
#else
|
|
||||||
return TSerial->available();
|
|
||||||
#endif
|
|
||||||
} else {
|
|
||||||
int avail = m_in_pos - m_out_pos;
|
|
||||||
if (avail < 0) avail += serial_buffer_size;
|
|
||||||
return avail;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#define TM_SERIAL_WAIT_SND { while (ESP.getCycleCount() < (wait + start)) if (!m_high_speed) optimistic_yield(1); wait += m_bit_time; } // Watchdog timeouts
|
|
||||||
#define TM_SERIAL_WAIT_SND_FAST { while (ESP.getCycleCount() < (wait + start)); wait += m_bit_time; }
|
|
||||||
#define TM_SERIAL_WAIT_RCV { while (ESP.getCycleCount() < (wait + start)); wait += m_bit_time; }
|
|
||||||
#define TM_SERIAL_WAIT_RCV_LOOP { while (ESP.getCycleCount() < (wait + start)); }
|
|
||||||
|
|
||||||
void ICACHE_RAM_ATTR TasmotaSerial::_fast_write(uint8_t b) {
|
|
||||||
uint32_t wait = m_bit_time;
|
|
||||||
uint32_t start = ESP.getCycleCount();
|
|
||||||
// Start bit;
|
|
||||||
digitalWrite(m_tx_pin, LOW);
|
|
||||||
TM_SERIAL_WAIT_SND_FAST;
|
|
||||||
for (uint32_t i = 0; i < 8; i++) {
|
|
||||||
digitalWrite(m_tx_pin, (b & 1) ? HIGH : LOW);
|
|
||||||
TM_SERIAL_WAIT_SND_FAST;
|
|
||||||
b >>= 1;
|
|
||||||
}
|
|
||||||
// Stop bit(s)
|
|
||||||
digitalWrite(m_tx_pin, HIGH);
|
|
||||||
for (uint32_t i = 0; i < m_stop_bits; i++) {
|
|
||||||
TM_SERIAL_WAIT_SND_FAST;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t TasmotaSerial::write(uint8_t b) {
|
|
||||||
if (m_hardserial) {
|
|
||||||
#ifdef ESP8266
|
|
||||||
return Serial.write(b);
|
|
||||||
#else
|
|
||||||
return TSerial->write(b);
|
|
||||||
#endif
|
|
||||||
} else {
|
|
||||||
if (-1 == m_tx_pin) return 0;
|
|
||||||
if (m_high_speed) {
|
|
||||||
cli(); // Disable interrupts in order to get a clean transmit
|
|
||||||
_fast_write(b);
|
|
||||||
sei();
|
|
||||||
} else {
|
|
||||||
uint32_t wait = m_bit_time;
|
|
||||||
//digitalWrite(m_tx_pin, HIGH); // already in HIGH mode
|
|
||||||
uint32_t start = ESP.getCycleCount();
|
|
||||||
// Start bit;
|
|
||||||
digitalWrite(m_tx_pin, LOW);
|
|
||||||
TM_SERIAL_WAIT_SND;
|
|
||||||
for (uint32_t i = 0; i < 8; i++) {
|
|
||||||
digitalWrite(m_tx_pin, (b & 1) ? HIGH : LOW);
|
|
||||||
TM_SERIAL_WAIT_SND;
|
|
||||||
b >>= 1;
|
|
||||||
}
|
|
||||||
// Stop bit(s)
|
|
||||||
digitalWrite(m_tx_pin, HIGH);
|
|
||||||
// re-enable interrupts during stop bits, it's not an issue if they are longer than expected
|
|
||||||
for (uint32_t i = 0; i < m_stop_bits; i++) {
|
|
||||||
TM_SERIAL_WAIT_SND;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void ICACHE_RAM_ATTR TasmotaSerial::rxRead() {
|
|
||||||
if (!m_nwmode) {
|
|
||||||
int32_t loop_read = m_very_high_speed ? serial_buffer_size : 1;
|
|
||||||
// Advance the starting point for the samples but compensate for the
|
|
||||||
// initial delay which occurs before the interrupt is delivered
|
|
||||||
uint32_t wait = m_bit_start_time;
|
|
||||||
uint32_t start = ESP.getCycleCount();
|
|
||||||
while (loop_read-- > 0) { // try to receveive all consecutive bytes in a raw
|
|
||||||
uint32_t rec = 0;
|
|
||||||
for (uint32_t i = 0; i < 8; i++) {
|
|
||||||
TM_SERIAL_WAIT_RCV;
|
|
||||||
rec >>= 1;
|
|
||||||
if (digitalRead(m_rx_pin)) rec |= 0x80;
|
|
||||||
}
|
|
||||||
// Store the received value in the buffer unless we have an overflow
|
|
||||||
uint32_t next = (m_in_pos+1) % serial_buffer_size;
|
|
||||||
if (next != (int)m_out_pos) {
|
|
||||||
m_buffer[m_in_pos] = rec;
|
|
||||||
m_in_pos = next;
|
|
||||||
}
|
|
||||||
|
|
||||||
TM_SERIAL_WAIT_RCV_LOOP; // wait for stop bit
|
|
||||||
if (2 == m_stop_bits) {
|
|
||||||
wait += m_bit_time;
|
|
||||||
TM_SERIAL_WAIT_RCV_LOOP;
|
|
||||||
}
|
|
||||||
wait += m_bit_time / 4;
|
|
||||||
|
|
||||||
if (loop_read <= 0) { break; } // exit now if not very high speed or buffer full
|
|
||||||
|
|
||||||
bool start_of_next_byte = false;
|
|
||||||
for (uint32_t i = 0; i < 12; i++) {
|
|
||||||
TM_SERIAL_WAIT_RCV_LOOP; // wait for 1/4 bits
|
|
||||||
wait += m_bit_time / 4;
|
|
||||||
if (!digitalRead(m_rx_pin)) {
|
|
||||||
// this is the start bit of the next byte
|
|
||||||
wait += m_bit_time; // we have advanced in the first 1/4 of bit, and already added 1/4 of bit so we're roughly centered. Just skip start bit.
|
|
||||||
start_of_next_byte = true;
|
|
||||||
m_bit_follow_metric++;
|
|
||||||
break; // exit loop
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!start_of_next_byte) {
|
|
||||||
break; // exit now if no sign of next byte
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Must clear this bit in the interrupt register,
|
|
||||||
// it gets set even when interrupts are disabled
|
|
||||||
GPIO_REG_WRITE(GPIO_STATUS_W1TC_ADDRESS, 1 << m_rx_pin);
|
|
||||||
} else {
|
|
||||||
uint32_t diff;
|
|
||||||
uint32_t level;
|
|
||||||
|
|
||||||
#define LASTBIT 9
|
|
||||||
|
|
||||||
GPIO_REG_WRITE(GPIO_STATUS_W1TC_ADDRESS, 1 << m_rx_pin);
|
|
||||||
|
|
||||||
level = digitalRead(m_rx_pin);
|
|
||||||
|
|
||||||
if (!level && !ss_index) {
|
|
||||||
// start condition
|
|
||||||
ss_bstart = ESP.getCycleCount() - (m_bit_time / 4);
|
|
||||||
ss_byte = 0;
|
|
||||||
ss_index++;
|
|
||||||
//digitalWrite(1, LOW);
|
|
||||||
} else {
|
|
||||||
// now any bit changes go here
|
|
||||||
// calc bit number
|
|
||||||
diff = (ESP.getCycleCount() - ss_bstart) / m_bit_time;
|
|
||||||
//digitalWrite(1, level);
|
|
||||||
|
|
||||||
if (!level && diff > LASTBIT) {
|
|
||||||
// start bit of next byte, store and restart
|
|
||||||
// leave irq at change
|
|
||||||
for (uint32_t i = ss_index; i <= LASTBIT; i++) {
|
|
||||||
ss_byte |= (1 << i);
|
|
||||||
}
|
|
||||||
//stobyte(0,ssp->ss_byte>>1);
|
|
||||||
uint32_t next = (m_in_pos + 1) % serial_buffer_size;
|
|
||||||
if (next != (uint32_t)m_out_pos) {
|
|
||||||
m_buffer[m_in_pos] = ss_byte >> 1;
|
|
||||||
m_in_pos = next;
|
|
||||||
}
|
|
||||||
|
|
||||||
ss_bstart = ESP.getCycleCount() - (m_bit_time / 4);
|
|
||||||
ss_byte = 0;
|
|
||||||
ss_index = 1;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (diff >= LASTBIT) {
|
|
||||||
// bit zero was 0,
|
|
||||||
//stobyte(0,ssp->ss_byte>>1);
|
|
||||||
uint32_t next = (m_in_pos + 1) % serial_buffer_size;
|
|
||||||
if (next != (uint32_t)m_out_pos) {
|
|
||||||
m_buffer[m_in_pos] = ss_byte >> 1;
|
|
||||||
m_in_pos = next;
|
|
||||||
}
|
|
||||||
ss_byte = 0;
|
|
||||||
ss_index = 0;
|
|
||||||
} else {
|
|
||||||
// shift in
|
|
||||||
for (uint32_t i = ss_index; i < diff; i++) {
|
|
||||||
if (!level) ss_byte |= (1 << i);
|
|
||||||
}
|
|
||||||
ss_index = diff;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,97 +0,0 @@
|
|||||||
/*
|
|
||||||
TasmotaSerial.h - Implementation of software serial with hardware serial fallback for Tasmota
|
|
||||||
|
|
||||||
Copyright (C) 2020 Theo Arends
|
|
||||||
|
|
||||||
This library is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef TasmotaSerial_h
|
|
||||||
#define TasmotaSerial_h
|
|
||||||
/*********************************************************************************************\
|
|
||||||
* TasmotaSerial supports up to 115200 baud with default buffer size of 64 bytes using optional no iram
|
|
||||||
*
|
|
||||||
* Based on EspSoftwareSerial v3.4.3 by Peter Lerup (https://github.com/plerup/espsoftwareserial)
|
|
||||||
\*********************************************************************************************/
|
|
||||||
|
|
||||||
#define TM_SERIAL_BAUDRATE 9600 // Default baudrate
|
|
||||||
#define TM_SERIAL_BUFFER_SIZE 64 // Receive buffer size
|
|
||||||
|
|
||||||
#include <inttypes.h>
|
|
||||||
#include <Stream.h>
|
|
||||||
|
|
||||||
#ifdef ESP32
|
|
||||||
#include <HardwareSerial.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class TasmotaSerial : public Stream {
|
|
||||||
public:
|
|
||||||
TasmotaSerial(int receive_pin, int transmit_pin, int hardware_fallback = 0, int nwmode = 0, int buffer_size = TM_SERIAL_BUFFER_SIZE);
|
|
||||||
virtual ~TasmotaSerial();
|
|
||||||
|
|
||||||
bool begin(long speed, int stop_bits = 1);
|
|
||||||
bool begin();
|
|
||||||
bool hardwareSerial();
|
|
||||||
int peek();
|
|
||||||
|
|
||||||
virtual size_t write(uint8_t byte);
|
|
||||||
virtual int read();
|
|
||||||
virtual int available();
|
|
||||||
virtual void flush();
|
|
||||||
|
|
||||||
void rxRead();
|
|
||||||
|
|
||||||
uint32_t getLoopReadMetric(void) const { return m_bit_follow_metric; }
|
|
||||||
|
|
||||||
#ifdef ESP32
|
|
||||||
uint32_t getUart(void) const { return m_uart; }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
using Print::write;
|
|
||||||
|
|
||||||
private:
|
|
||||||
bool isValidGPIOpin(int pin);
|
|
||||||
size_t txWrite(uint8_t byte);
|
|
||||||
|
|
||||||
// Member variables
|
|
||||||
int m_rx_pin;
|
|
||||||
int m_tx_pin;
|
|
||||||
uint32_t m_stop_bits;
|
|
||||||
uint32_t ss_byte;
|
|
||||||
uint32_t ss_bstart;
|
|
||||||
uint32_t ss_index;
|
|
||||||
uint32_t m_bit_time;
|
|
||||||
uint32_t m_bit_start_time;
|
|
||||||
uint32_t m_bit_follow_metric = 0;
|
|
||||||
uint32_t m_in_pos;
|
|
||||||
uint32_t m_out_pos;
|
|
||||||
uint32_t serial_buffer_size;
|
|
||||||
bool m_valid;
|
|
||||||
bool m_nwmode;
|
|
||||||
bool m_hardserial;
|
|
||||||
bool m_hardswap;
|
|
||||||
bool m_high_speed = false;
|
|
||||||
bool m_very_high_speed = false; // above 100000 bauds
|
|
||||||
uint8_t *m_buffer;
|
|
||||||
|
|
||||||
void _fast_write(uint8_t b); // IRAM minimized version
|
|
||||||
|
|
||||||
#ifdef ESP32
|
|
||||||
HardwareSerial *TSerial;
|
|
||||||
int m_uart = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // TasmotaSerial_h
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
name=UdpListener
|
|
||||||
version=1.0
|
|
||||||
author=Ivan Grokhotkov, Stephan Hadinger
|
|
||||||
maintainer=Stephan <stephan.hadinger@gmail.com>
|
|
||||||
sentence=UdpListener optimized for static and limite memory allocation, to reduce memory footprint of receiving SSDP request, as a replacement for WifiUdp.
|
|
||||||
paragraph=This class only handles receiving UDP Multicast packets. For sending packets, use WifiUdp.
|
|
||||||
architectures=esp8266
|
|
||||||
@ -1,209 +0,0 @@
|
|||||||
/*
|
|
||||||
UdpListener.h - webserver for Tasmota
|
|
||||||
|
|
||||||
Copyright (C) 2020 Theo Arends & Stephan Hadinger
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.@
|
|
||||||
*/
|
|
||||||
|
|
||||||
// adapted from:
|
|
||||||
/*
|
|
||||||
UdpContext.h - UDP connection handling on top of lwIP
|
|
||||||
|
|
||||||
Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
|
|
||||||
This file is part of the esp8266 core for Arduino environment.
|
|
||||||
|
|
||||||
This library is free software; you can redistribute it and/or
|
|
||||||
modify it under the terms of the GNU Lesser General Public
|
|
||||||
License as published by the Free Software Foundation; either
|
|
||||||
version 2.1 of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This library is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
Lesser General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Lesser General Public
|
|
||||||
License along with this library; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is a stripped down version of Udp handler to avoid overflowing
|
|
||||||
* memory when lots of multicast SSDP packets arrive.
|
|
||||||
* The pbuf is freed immediately upon arrival of the packet.
|
|
||||||
*
|
|
||||||
* Packet data are kept in a statically area in RAM and keeps
|
|
||||||
* only the <n> first bytes (200 by default) of each packet.
|
|
||||||
* The number of packets treated is limited (3 by default), any
|
|
||||||
* new packet arriving is dropped.
|
|
||||||
*
|
|
||||||
* This class does only receiving multicast packets for LWIP2
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef UDPMULTICASTLISTENER_H
|
|
||||||
#define UDPMULTICASTLISTENER_H
|
|
||||||
|
|
||||||
#ifdef ESP8266
|
|
||||||
// #include <Arduino.h>
|
|
||||||
|
|
||||||
extern "C" {
|
|
||||||
#include <lwip/udp.h>
|
|
||||||
#include <lwip/igmp.h>
|
|
||||||
}
|
|
||||||
|
|
||||||
template <size_t PACKET_SIZE>
|
|
||||||
struct UdpPacket {
|
|
||||||
IPAddress srcaddr;
|
|
||||||
IPAddress dstaddr;
|
|
||||||
int16_t srcport;
|
|
||||||
netif* input_netif;
|
|
||||||
size_t len;
|
|
||||||
uint8_t buf[PACKET_SIZE];
|
|
||||||
};
|
|
||||||
|
|
||||||
template <size_t PACKET_SIZE>
|
|
||||||
class UdpListener
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
typedef std::function<void(void)> rxhandler_t;
|
|
||||||
|
|
||||||
UdpListener(size_t packet_number)
|
|
||||||
: _pcb(0)
|
|
||||||
, _packet_number(packet_number)
|
|
||||||
, _buffers(nullptr)
|
|
||||||
, _udp_packets(0)
|
|
||||||
, _udp_ready(false)
|
|
||||||
, _udp_index(0)
|
|
||||||
{
|
|
||||||
_packet_number = packet_number;
|
|
||||||
_buffers = new UdpPacket<PACKET_SIZE>[_packet_number];
|
|
||||||
_pcb = udp_new();
|
|
||||||
}
|
|
||||||
|
|
||||||
~UdpListener()
|
|
||||||
{
|
|
||||||
udp_remove(_pcb);
|
|
||||||
_pcb = 0;
|
|
||||||
delete[] _buffers;
|
|
||||||
_buffers = nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
void reset(void)
|
|
||||||
{
|
|
||||||
_udp_packets = 0;
|
|
||||||
_udp_index = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool listen(const IPAddress& addr, uint16_t port)
|
|
||||||
{
|
|
||||||
if (!_buffers) { return false; }
|
|
||||||
udp_recv(_pcb, &_s_recv, (void *) this);
|
|
||||||
err_t err = udp_bind(_pcb, addr, port);
|
|
||||||
return err == ERR_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
void disconnect()
|
|
||||||
{
|
|
||||||
udp_disconnect(_pcb);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool next()
|
|
||||||
{
|
|
||||||
if (!_buffers) { return false; }
|
|
||||||
if (_udp_packets > 0) {
|
|
||||||
if (!_udp_ready) {
|
|
||||||
// we just consume the first packet
|
|
||||||
_udp_ready = true;
|
|
||||||
} else {
|
|
||||||
_udp_packets--;
|
|
||||||
_udp_index = (_udp_index + 1) % _packet_number; // advance to next buffer index in ring
|
|
||||||
if (_udp_packets == 0) {
|
|
||||||
_udp_ready = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
_udp_ready = false;
|
|
||||||
}
|
|
||||||
return _udp_ready;
|
|
||||||
}
|
|
||||||
|
|
||||||
UdpPacket<PACKET_SIZE> * read(void)
|
|
||||||
{
|
|
||||||
if (!_buffers) { return nullptr; }
|
|
||||||
if (_udp_ready) { // we have a packet ready to consume
|
|
||||||
return &_buffers[_udp_index];
|
|
||||||
} else {
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
void _recv(udp_pcb *upcb, pbuf *pb,
|
|
||||||
const ip_addr_t *srcaddr, u16_t srcport)
|
|
||||||
{
|
|
||||||
if (!_buffers) { pbuf_free(pb); return; }
|
|
||||||
// Serial.printf(">>> _recv: _udp_packets = %d, _udp_index = %d, tot_len = %d\n", _udp_packets, _udp_index, pb->tot_len);
|
|
||||||
if (_udp_packets >= _packet_number) {
|
|
||||||
// we don't have slots anymore, drop packet
|
|
||||||
pbuf_free(pb);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t next_slot = (_udp_index + _udp_packets) % _packet_number;
|
|
||||||
|
|
||||||
size_t packet_len = pb->tot_len;
|
|
||||||
if (packet_len > PACKET_SIZE) { packet_len = PACKET_SIZE; }
|
|
||||||
|
|
||||||
uint8_t * dst = &_buffers[next_slot].buf[0];
|
|
||||||
void* buf = pbuf_get_contiguous(pb, dst, PACKET_SIZE, packet_len, 0);
|
|
||||||
if (buf) {
|
|
||||||
|
|
||||||
if (buf != dst)
|
|
||||||
memcpy(dst, buf, packet_len);
|
|
||||||
_buffers[next_slot].len = packet_len;
|
|
||||||
|
|
||||||
_buffers[next_slot].srcaddr = srcaddr;
|
|
||||||
_buffers[next_slot].dstaddr = ip_current_dest_addr();
|
|
||||||
_buffers[next_slot].srcport = srcport;
|
|
||||||
_buffers[next_slot].input_netif = ip_current_input_netif();
|
|
||||||
_udp_packets++; // we have one packet ready
|
|
||||||
}
|
|
||||||
pbuf_free(pb); // free memory immediately
|
|
||||||
}
|
|
||||||
|
|
||||||
static void _s_recv(void *arg,
|
|
||||||
udp_pcb *upcb, pbuf *p,
|
|
||||||
const ip_addr_t *srcaddr, u16_t srcport)
|
|
||||||
{
|
|
||||||
reinterpret_cast<UdpListener*>(arg)->_recv(upcb, p, srcaddr, srcport);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
udp_pcb* _pcb;
|
|
||||||
uint8_t _packet_number;
|
|
||||||
|
|
||||||
UdpPacket<PACKET_SIZE> * _buffers;
|
|
||||||
|
|
||||||
// how many packets are ready.
|
|
||||||
int8_t _udp_packets; // number of udp packets ready to consume
|
|
||||||
bool _udp_ready; // is a packet currenlty consumed after a call to next()
|
|
||||||
// ring buffer ranges from 0..(_packet_number-1)
|
|
||||||
int8_t _udp_index; // current index in the ring buffer
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // ESP8266
|
|
||||||
#endif //UDPMULTICASTLISTENER_H
|
|
||||||
@ -1,165 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2019 Siara Logics (cc)
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
* @author Arundale R.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Pre-compute c_95[] and l_95[]
|
|
||||||
|
|
||||||
#include <time.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
typedef unsigned char byte;
|
|
||||||
|
|
||||||
enum {SHX_SET1 = 0, SHX_SET1A, SHX_SET1B, SHX_SET2, SHX_SET3, SHX_SET4, SHX_SET4A};
|
|
||||||
char us_vcodes[] = {0, 2, 3, 4, 10, 11, 12, 13, 14, 30, 31};
|
|
||||||
char us_vcode_lens[] = {2, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5};
|
|
||||||
char us_sets[][11] =
|
|
||||||
{{ 0, ' ', 'e', 0, 't', 'a', 'o', 'i', 'n', 's', 'r'},
|
|
||||||
{ 0, 'l', 'c', 'd', 'h', 'u', 'p', 'm', 'b', 'g', 'w'},
|
|
||||||
{'f', 'y', 'v', 'k', 'q', 'j', 'x', 'z', 0, 0, 0},
|
|
||||||
{ 0, '9', '0', '1', '2', '3', '4', '5', '6', '7', '8'},
|
|
||||||
{'.', ',', '-', '/', '?', '+', ' ', '(', ')', '$', '@'},
|
|
||||||
{';', '#', ':', '<', '^', '*', '"', '{', '}', '[', ']'},
|
|
||||||
{'=', '%', '\'', '>', '&', '_', '!', '\\', '|', '~', '`'}};
|
|
||||||
// {{ 0, ' ', 'e', 0, 't', 'a', 'o', 'i', 'n', 's', 'r'},
|
|
||||||
// { 0, 'l', 'c', 'd', 'h', 'u', 'p', 'm', 'b', 'g', 'w'},
|
|
||||||
// {'f', 'y', 'v', 'k', 'q', 'j', 'x', 'z', 0, 0, 0},
|
|
||||||
// { 0, '9', '0', '1', '2', '3', '4', '5', '6', '7', '8'},
|
|
||||||
// {'.', ',', '-', '/', '=', '+', ' ', '(', ')', '$', '%'},
|
|
||||||
// {'&', ';', ':', '<', '>', '*', '"', '{', '}', '[', ']'},
|
|
||||||
// {'@', '?', '\'', '^', '#', '_', '!', '\\', '|', '~', '`'}};
|
|
||||||
|
|
||||||
unsigned int c_95[95] ;
|
|
||||||
unsigned char l_95[95] ;
|
|
||||||
|
|
||||||
|
|
||||||
void init_coder() {
|
|
||||||
for (int i = 0; i < 7; i++) {
|
|
||||||
for (int j = 0; j < 11; j++) {
|
|
||||||
char c = us_sets[i][j];
|
|
||||||
if (c != 0 && c != 32) {
|
|
||||||
int ascii = c - 32;
|
|
||||||
//int prev_code = c_95[ascii];
|
|
||||||
//int prev_code_len = l_95[ascii];
|
|
||||||
switch (i) {
|
|
||||||
case SHX_SET1: // just us_vcode
|
|
||||||
c_95[ascii] = (us_vcodes[j] << (16 - us_vcode_lens[j]));
|
|
||||||
l_95[ascii] = us_vcode_lens[j];
|
|
||||||
//checkPreus_vcodes(c, prev_code, prev_code_len, c_95[ascii], l_95[ascii]);
|
|
||||||
if (c >= 'a' && c <= 'z') {
|
|
||||||
ascii -= ('a' - 'A');
|
|
||||||
//prev_code = c_95[ascii];
|
|
||||||
//prev_code_len = l_95[ascii];
|
|
||||||
c_95[ascii] = (2 << 12) + (us_vcodes[j] << (12 - us_vcode_lens[j]));
|
|
||||||
l_95[ascii] = 4 + us_vcode_lens[j];
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case SHX_SET1A: // 000 + us_vcode
|
|
||||||
c_95[ascii] = 0 + (us_vcodes[j] << (13 - us_vcode_lens[j]));
|
|
||||||
l_95[ascii] = 3 + us_vcode_lens[j];
|
|
||||||
//checkPreus_vcodes(c, prev_code, prev_code_len, c_95[ascii], l_95[ascii]);
|
|
||||||
if (c >= 'a' && c <= 'z') {
|
|
||||||
ascii -= ('a' - 'A');
|
|
||||||
//prev_code = c_95[ascii];
|
|
||||||
//prev_code_len = l_95[ascii];
|
|
||||||
c_95[ascii] = (2 << 12) + 0 + (us_vcodes[j] << (9 - us_vcode_lens[j]));
|
|
||||||
l_95[ascii] = 4 + 3 + us_vcode_lens[j];
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case SHX_SET1B: // 00110 + us_vcode
|
|
||||||
c_95[ascii] = (6 << 11) + (us_vcodes[j] << (11 - us_vcode_lens[j]));
|
|
||||||
l_95[ascii] = 5 + us_vcode_lens[j];
|
|
||||||
//checkPreus_vcodes(c, prev_code, prev_code_len, c_95[ascii], l_95[ascii]);
|
|
||||||
if (c >= 'a' && c <= 'z') {
|
|
||||||
ascii -= ('a' - 'A');
|
|
||||||
//prev_code = c_95[ascii];
|
|
||||||
//prev_code_len = l_95[ascii];
|
|
||||||
c_95[ascii] = (2 << 12) + (6 << 7) + (us_vcodes[j] << (7 - us_vcode_lens[j]));
|
|
||||||
l_95[ascii] = 4 + 5 + us_vcode_lens[j];
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case SHX_SET2: // 0011100 + us_vcode
|
|
||||||
c_95[ascii] = (28 << 9) + (us_vcodes[j] << (9 - us_vcode_lens[j]));
|
|
||||||
l_95[ascii] = 7 + us_vcode_lens[j];
|
|
||||||
break;
|
|
||||||
case SHX_SET3: // 0011101 + us_vcode
|
|
||||||
c_95[ascii] = (29 << 9) + (us_vcodes[j] << (9 - us_vcode_lens[j]));
|
|
||||||
l_95[ascii] = 7 + us_vcode_lens[j];
|
|
||||||
break;
|
|
||||||
case SHX_SET4: // 0011110 + us_vcode
|
|
||||||
c_95[ascii] = (30 << 9) + (us_vcodes[j] << (9 - us_vcode_lens[j]));
|
|
||||||
l_95[ascii] = 7 + us_vcode_lens[j];
|
|
||||||
break;
|
|
||||||
case SHX_SET4A: // 0011111 + us_vcode
|
|
||||||
c_95[ascii] = (31 << 9) + (us_vcodes[j] << (9 - us_vcode_lens[j]));
|
|
||||||
l_95[ascii] = 7 + us_vcode_lens[j];
|
|
||||||
}
|
|
||||||
//checkPreus_vcodes(c, prev_code, prev_code_len, c_95[ascii], l_95[ascii]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
c_95[0] = 16384;
|
|
||||||
l_95[0] = 3;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(int argv, char *args[]) {
|
|
||||||
init_coder();
|
|
||||||
|
|
||||||
printf("uint16_t c_95[95] PROGMEM = {");
|
|
||||||
for (uint8_t i = 0; i<95; i++) {
|
|
||||||
if (i) { printf(", "); }
|
|
||||||
printf("0x%04X", c_95[i]);
|
|
||||||
}
|
|
||||||
printf(" };\n");
|
|
||||||
|
|
||||||
printf("uint8_t l_95[95] PROGMEM = {");
|
|
||||||
for (uint8_t i = 0; i<95; i++) {
|
|
||||||
if (i) { printf(", "); }
|
|
||||||
printf("%6d", l_95[i]);
|
|
||||||
}
|
|
||||||
printf(" };\n");
|
|
||||||
|
|
||||||
printf("\n\n");
|
|
||||||
|
|
||||||
printf("uint16_t c_95[95] PROGMEM = {");
|
|
||||||
for (uint8_t i = 0; i<95; i++) {
|
|
||||||
if (i) { printf(", "); }
|
|
||||||
printf("%5d", c_95[i]);
|
|
||||||
}
|
|
||||||
printf(" };\n");
|
|
||||||
|
|
||||||
printf("uint8_t l_95[95] PROGMEM = {");
|
|
||||||
for (uint8_t i = 0; i<95; i++) {
|
|
||||||
if (i) { printf(", "); }
|
|
||||||
printf("%5d", l_95[i]);
|
|
||||||
}
|
|
||||||
printf(" };\n");
|
|
||||||
|
|
||||||
|
|
||||||
printf("uint16_t cl_95[95] PROGMEM = {");
|
|
||||||
for (uint8_t i = 0; i<95; i++) {
|
|
||||||
if (i) { printf(", "); }
|
|
||||||
printf("0x%04X + %2d", c_95[i], l_95[i]);
|
|
||||||
}
|
|
||||||
printf(" };\n");
|
|
||||||
|
|
||||||
}
|
|
||||||
Binary file not shown.
@ -1,8 +0,0 @@
|
|||||||
name=Unishox Compressor Decompressor highly customized and optimized for ESP8266 and Tasmota
|
|
||||||
version=1.0
|
|
||||||
author=Arundale Ramanathan, Stephan Hadinger
|
|
||||||
maintainer=Arun <arun@siara.cc>, Stephan <stephan.hadinger@gmail.com>
|
|
||||||
sentence=Unishox compression for Tasmota Rules
|
|
||||||
paragraph=It is based on Unishox hybrid encoding technique. This version has specific Unicode code removed for size.
|
|
||||||
url=https://github.com/siara-cc/Unishox
|
|
||||||
architectures=esp8266
|
|
||||||
@ -1,521 +0,0 @@
|
|||||||
#!/usr/bin/env python
|
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
"""
|
|
||||||
Python Class for compressing short strings.
|
|
||||||
|
|
||||||
This class contains a highly modified and optimized version of Unishox
|
|
||||||
for Tasmota converted in C ported to Pyhton3.
|
|
||||||
|
|
||||||
It was basically developed to individually compress and decompress small strings
|
|
||||||
(see https://github.com/siara-cc/Unishox)
|
|
||||||
In general compression utilities such as zip, gzip do not compress short strings
|
|
||||||
well and often expand them. They also use lots of memory which makes them unusable
|
|
||||||
in constrained environments like Arduino.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
"""
|
|
||||||
|
|
||||||
class Unishox:
|
|
||||||
"""
|
|
||||||
This is a highly modified and optimized version of Unishox
|
|
||||||
for Tasmota, aimed at compressing `Rules` which are typically
|
|
||||||
short strings from 50 to 500 bytes.
|
|
||||||
|
|
||||||
@author Stephan Hadinger
|
|
||||||
@revised Norbert Richter
|
|
||||||
"""
|
|
||||||
|
|
||||||
# pylint: disable=bad-continuation,bad-whitespace,line-too-long
|
|
||||||
#cl_95 = [0x4000 + 3, 0x3F80 + 11, 0x3D80 + 11, 0x3C80 + 10, 0x3BE0 + 12, 0x3E80 + 10, 0x3F40 + 11, 0x3EC0 + 10, 0x3BA0 + 11, 0x3BC0 + 11, 0x3D60 + 11, 0x3B60 + 11, 0x3A80 + 10, 0x3AC0 + 10, 0x3A00 + 9, 0x3B00 + 10, 0x38C0 + 10, 0x3900 + 10, 0x3940 + 11, 0x3960 + 11, 0x3980 + 11, 0x39A0 + 11, 0x39C0 + 11, 0x39E0 + 12, 0x39F0 + 12, 0x3880 + 10, 0x3CC0 + 10, 0x3C00 + 9, 0x3D00 + 10, 0x3E00 + 9, 0x3F00 + 10, 0x3B40 + 11, 0x3BF0 + 12, 0x2B00 + 8, 0x21C0 + 11, 0x20C0 + 10, 0x2100 + 10, 0x2600 + 7, 0x2300 + 11, 0x21E0 + 12, 0x2140 + 11, 0x2D00 + 8, 0x2358 + 13, 0x2340 + 12, 0x2080 + 10, 0x21A0 + 11, 0x2E00 + 8, 0x2C00 + 8, 0x2180 + 11, 0x2350 + 13, 0x2F80 + 9, 0x2F00 + 9, 0x2A00 + 8, 0x2160 + 11, 0x2330 + 12, 0x21F0 + 12, 0x2360 + 13, 0x2320 + 12, 0x2368 + 13, 0x3DE0 + 12, 0x3FA0 + 11, 0x3DF0 + 12, 0x3D40 + 11, 0x3F60 + 11, 0x3FF0 + 12, 0xB000 + 4, 0x1C00 + 7, 0x0C00 + 6, 0x1000 + 6, 0x6000 + 3, 0x3000 + 7, 0x1E00 + 8, 0x1400 + 7, 0xD000 + 4, 0x3580 + 9, 0x3400 + 8, 0x0800 + 6, 0x1A00 + 7, 0xE000 + 4, 0xC000 + 4, 0x1800 + 7, 0x3500 + 9, 0xF800 + 5, 0xF000 + 5, 0xA000 + 4, 0x1600 + 7, 0x3300 + 8, 0x1F00 + 8, 0x3600 + 9, 0x3200 + 8, 0x3680 + 9, 0x3DA0 + 11, 0x3FC0 + 11, 0x3DC0 + 11, 0x3FE0 + 12]
|
|
||||||
cl_95 = [0x4000 + 3, 0x3F80 + 11, 0x3D80 + 11, 0x3C80 + 10, 0x3BE0 + 12, 0x3E80 + 10, 0x3F40 + 11, 0x3EC0 + 10, 0x3BA0 + 11, 0x3BC0 + 11, 0x3D60 + 11, 0x3B60 + 11, 0x3A80 + 10, 0x3AC0 + 10, 0x3A00 + 9, 0x3B00 + 10, 0x38C0 + 10, 0x3900 + 10, 0x3940 + 11, 0x3960 + 11, 0x3980 + 11, 0x39A0 + 11, 0x39C0 + 11, 0x39E0 + 12, 0x39F0 + 12, 0x3880 + 10, 0x3CC0 + 10, 0x3C00 + 9, 0x3D00 + 10, 0x3E00 + 9, 0x3F00 + 10, 0x3B40 + 11, 0x3BF0 + 12, 0x2B00 + 8, 0x21C0 + 11, 0x20C0 + 10, 0x2100 + 10, 0x2600 + 7, 0x2300 + 11, 0x21E0 + 12, 0x2140 + 11, 0x2D00 + 8, 0x46B0 + 13, 0x2340 + 12, 0x2080 + 10, 0x21A0 + 11, 0x2E00 + 8, 0x2C00 + 8, 0x2180 + 11, 0x46A0 + 13, 0x2F80 + 9, 0x2F00 + 9, 0x2A00 + 8, 0x2160 + 11, 0x2330 + 12, 0x21F0 + 12, 0x46C0 + 13, 0x2320 + 12, 0x46D0 + 13, 0x3DE0 + 12, 0x3FA0 + 11, 0x3DF0 + 12, 0x3D40 + 11, 0x3F60 + 11, 0x3FF0 + 12, 0xB000 + 4, 0x1C00 + 7, 0x0C00 + 6, 0x1000 + 6, 0x6000 + 3, 0x3000 + 7, 0x1E00 + 8, 0x1400 + 7, 0xD000 + 4, 0x3580 + 9, 0x3400 + 8, 0x0800 + 6, 0x1A00 + 7, 0xE000 + 4, 0xC000 + 4, 0x1800 + 7, 0x3500 + 9, 0xF800 + 5, 0xF000 + 5, 0xA000 + 4, 0x1600 + 7, 0x3300 + 8, 0x1F00 + 8, 0x3600 + 9, 0x3200 + 8, 0x3680 + 9, 0x3DA0 + 11, 0x3FC0 + 11, 0x3DC0 + 11, 0x3FE0 + 12]
|
|
||||||
|
|
||||||
# enum {SHX_STATE_1 = 1, SHX_STATE_2}; // removed Unicode state
|
|
||||||
SHX_STATE_1 = 1
|
|
||||||
SHX_STATE_2 = 2
|
|
||||||
|
|
||||||
SHX_SET1 = 0
|
|
||||||
SHX_SET1A = 1
|
|
||||||
SHX_SET1B = 2
|
|
||||||
SHX_SET2 = 3
|
|
||||||
|
|
||||||
sets = [['\0', ' ', 'e', '\0', 't', 'a', 'o', 'i', 'n', 's', 'r'],
|
|
||||||
['\0', 'l', 'c', 'd', 'h', 'u', 'p', 'm', 'b', 'g', 'w'],
|
|
||||||
['f', 'y', 'v', 'k', 'q', 'j', 'x', 'z', '\0', '\0', '\0'],
|
|
||||||
['\0', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8'],
|
|
||||||
['.', ',', '-', '/', '?', '+', ' ', '(', ')', '$', '@'],
|
|
||||||
[';', '#', ':', '<', '^', '*', '"', '{', '}', '[', ']'],
|
|
||||||
['=', '%', '\'', '>', '&', '_', '!', '\\', '|', '~', '`']]
|
|
||||||
|
|
||||||
us_vcode = [2 + (0 << 3), 3 + (3 << 3), 3 + (1 << 3), 4 + (6 << 3), 0,
|
|
||||||
# 5, 6, 7, 8, 9, 10
|
|
||||||
4 + (4 << 3), 3 + (2 << 3), 4 + (8 << 3), 0, 0, 0,
|
|
||||||
# 11, 12, 13, 14, 15
|
|
||||||
4 + (7 << 3), 0, 4 + (5 << 3), 0, 5 + (9 << 3),
|
|
||||||
# 16, 17, 18, 19, 20, 21, 22, 23
|
|
||||||
0, 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
# 24, 25, 26, 27, 28, 29, 30, 31
|
|
||||||
0, 0, 0, 0, 0, 0, 0, 5 + (10 << 3) ]
|
|
||||||
# 0, 1, 2, 3, 4, 5, 6, 7,
|
|
||||||
us_hcode = [1 + (1 << 3), 2 + (0 << 3), 0, 3 + (2 << 3), 0, 0, 0, 5 + (3 << 3),
|
|
||||||
# 8, 9, 10, 11, 12, 13, 14, 15,
|
|
||||||
0, 0, 0, 0, 0, 0, 0, 5 + (5 << 3),
|
|
||||||
# 16, 17, 18, 19, 20, 21, 22, 23
|
|
||||||
0, 0, 0, 0, 0, 0, 0, 5 + (4 << 3),
|
|
||||||
# 24, 25, 26, 27, 28, 29, 30, 31
|
|
||||||
0, 0, 0, 0, 0, 0, 0, 5 + (6 << 3) ]
|
|
||||||
# pylint: enable=bad-continuation,bad-whitespace
|
|
||||||
|
|
||||||
ESCAPE_MARKER = 0x2A
|
|
||||||
|
|
||||||
TERM_CODE = 0x37C0
|
|
||||||
# TERM_CODE_LEN = 10
|
|
||||||
DICT_CODE = 0x0000
|
|
||||||
DICT_CODE_LEN = 5
|
|
||||||
#DICT_OTHER_CODE = 0x0000
|
|
||||||
#DICT_OTHER_CODE_LEN = 6
|
|
||||||
RPT_CODE_TASMOTA = 0x3780
|
|
||||||
RPT_CODE_TASMOTA_LEN = 10
|
|
||||||
BACK2_STATE1_CODE = 0x2000
|
|
||||||
BACK2_STATE1_CODE_LEN = 4
|
|
||||||
#BACK_FROM_UNI_CODE = 0xFE00
|
|
||||||
#BACK_FROM_UNI_CODE_LEN = 8
|
|
||||||
LF_CODE = 0x3700
|
|
||||||
LF_CODE_LEN = 9
|
|
||||||
TAB_CODE = 0x2400
|
|
||||||
TAB_CODE_LEN = 7
|
|
||||||
ALL_UPPER_CODE = 0x2200
|
|
||||||
ALL_UPPER_CODE_LEN = 8
|
|
||||||
SW2_STATE2_CODE = 0x3800
|
|
||||||
SW2_STATE2_CODE_LEN = 7
|
|
||||||
ST2_SPC_CODE = 0x3B80
|
|
||||||
ST2_SPC_CODE_LEN = 11
|
|
||||||
BIN_CODE_TASMOTA = 0x8000
|
|
||||||
BIN_CODE_TASMOTA_LEN = 3
|
|
||||||
|
|
||||||
NICE_LEN = 5
|
|
||||||
|
|
||||||
mask = [0x80, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC, 0xFE, 0xFF]
|
|
||||||
|
|
||||||
# pylint: disable=missing-function-docstring,invalid-name
|
|
||||||
|
|
||||||
# Input
|
|
||||||
# out = bytearray
|
|
||||||
def append_bits(self, out, ol, code, clen, state):
|
|
||||||
#print("Append bits {ol} {code} {clen} {state}".format(ol=ol, code=code, clen=clen, state=state))
|
|
||||||
if state == self.SHX_STATE_2:
|
|
||||||
# remove change state prefix
|
|
||||||
if (code >> 9) == 0x1C:
|
|
||||||
code <<= 7
|
|
||||||
clen -= 7
|
|
||||||
while clen > 0:
|
|
||||||
cur_bit = ol % 8
|
|
||||||
blen = 8 if (clen > 8) else clen
|
|
||||||
a_byte = (code >> 8) & self.mask[blen - 1]
|
|
||||||
#print("append_bits a_byte {ab} blen {blen}".format(ab=a_byte,blen=blen))
|
|
||||||
a_byte >>= cur_bit
|
|
||||||
if blen + cur_bit > 8:
|
|
||||||
blen = (8 - cur_bit)
|
|
||||||
if cur_bit == 0:
|
|
||||||
out[ol // 8] = a_byte
|
|
||||||
else:
|
|
||||||
out[ol // 8] |= a_byte
|
|
||||||
code <<= blen
|
|
||||||
ol += blen
|
|
||||||
if 0 == ol % 8: # pylint: disable=misplaced-comparison-constant
|
|
||||||
# we completed a full byte
|
|
||||||
last_c = out[(ol // 8) - 1]
|
|
||||||
if last_c in (0, self.ESCAPE_MARKER):
|
|
||||||
out[ol // 8] = 1 + last_c # increment to 0x01 or 0x2B
|
|
||||||
out[(ol // 8) -1] = self.ESCAPE_MARKER # replace old value with marker
|
|
||||||
ol += 8 # add one full byte
|
|
||||||
clen -= blen
|
|
||||||
return ol
|
|
||||||
|
|
||||||
codes = [0x82, 0xC3, 0xE5, 0xED, 0xF5] # pylint: disable=bad-whitespace
|
|
||||||
bit_len = [ 5, 7, 9, 12, 16] # pylint: disable=bad-whitespace
|
|
||||||
|
|
||||||
def encodeCount(self, out, ol, count):
|
|
||||||
#print("encodeCount ol = {ol}, count = {count}".format(ol=ol, count=count))
|
|
||||||
till = 0
|
|
||||||
base = 0
|
|
||||||
for i in range(len(self.bit_len)):
|
|
||||||
bit_len_i = self.bit_len[i]
|
|
||||||
till += (1 << bit_len_i)
|
|
||||||
if count < till:
|
|
||||||
codes_i = self.codes[i]
|
|
||||||
ol = self.append_bits(out, ol, (codes_i & 0xF8) << 8, codes_i & 0x07, 1)
|
|
||||||
#print("encodeCount append_bits ol = {ol}, code = {code}, len = {len}".format(ol=ol,code=(codes_i & 0xF8) << 8,len=codes_i & 0x07))
|
|
||||||
ol = self.append_bits(out, ol, (count - base) << (16 - bit_len_i), bit_len_i, 1)
|
|
||||||
#print("encodeCount append_bits ol = {ol}, code = {code}, len = {len}".format(ol=ol,code=(count - base) << (16 - bit_len_i),len=bit_len_i))
|
|
||||||
return ol
|
|
||||||
base = till
|
|
||||||
return ol
|
|
||||||
|
|
||||||
# Returns (int, ol, state, is_all_upper)
|
|
||||||
def matchOccurance(self, inn, len_, l_, out, ol, state, is_all_upper):
|
|
||||||
# int j, k;
|
|
||||||
longest_dist = 0
|
|
||||||
longest_len = 0
|
|
||||||
#for (j = l_ - self.NICE_LEN; j >= 0; j--) {
|
|
||||||
j = l_ - self.NICE_LEN
|
|
||||||
while j >= 0:
|
|
||||||
k = l_
|
|
||||||
#for (k = l_; k < len && j + k - l_ < l_; k++) {
|
|
||||||
while k < len_ and j + k - l_ < l_:
|
|
||||||
if inn[k] != inn[j + k - l_]:
|
|
||||||
break
|
|
||||||
k += 1
|
|
||||||
if k - l_ > self.NICE_LEN - 1:
|
|
||||||
match_len = k - l_ - self.NICE_LEN
|
|
||||||
match_dist = l_ - j - self.NICE_LEN + 1
|
|
||||||
if match_len > longest_len:
|
|
||||||
longest_len = match_len
|
|
||||||
longest_dist = match_dist
|
|
||||||
j -= 1
|
|
||||||
|
|
||||||
if longest_len:
|
|
||||||
#print("longest_len {ll}".format(ll=longest_len))
|
|
||||||
#ol_save = ol
|
|
||||||
if state == self.SHX_STATE_2 or is_all_upper:
|
|
||||||
is_all_upper = 0
|
|
||||||
state = self.SHX_STATE_1
|
|
||||||
ol = self.append_bits(out, ol, self.BACK2_STATE1_CODE, self.BACK2_STATE1_CODE_LEN, state)
|
|
||||||
|
|
||||||
ol = self.append_bits(out, ol, self.DICT_CODE, self.DICT_CODE_LEN, 1)
|
|
||||||
ol = self.encodeCount(out, ol, longest_len)
|
|
||||||
ol = self.encodeCount(out, ol, longest_dist)
|
|
||||||
#print("longest_len {ll} longest_dist {ld} ol {ols}-{ol}".format(ll=longest_len, ld=longest_dist, ol=ol, ols=ol_save))
|
|
||||||
l_ += longest_len + self.NICE_LEN
|
|
||||||
l_ -= 1
|
|
||||||
|
|
||||||
return l_, ol, state, is_all_upper
|
|
||||||
return -l_, ol, state, is_all_upper
|
|
||||||
|
|
||||||
|
|
||||||
def compress(self, inn, len_, out, len_out):
|
|
||||||
ol = 0
|
|
||||||
state = self.SHX_STATE_1
|
|
||||||
is_all_upper = 0
|
|
||||||
l = 0
|
|
||||||
while l < len_:
|
|
||||||
# for (l=0; l<len_; l++) {
|
|
||||||
|
|
||||||
c_in = inn[l]
|
|
||||||
|
|
||||||
if l and l < len_ - 4:
|
|
||||||
if c_in == inn[l - 1] and c_in == inn[l + 1] and c_in == inn[l + 2] and c_in == inn[l + 3]:
|
|
||||||
rpt_count = l + 4
|
|
||||||
while rpt_count < len_ and inn[rpt_count] == c_in:
|
|
||||||
rpt_count += 1
|
|
||||||
rpt_count -= l
|
|
||||||
|
|
||||||
if state == self.SHX_STATE_2 or is_all_upper:
|
|
||||||
is_all_upper = 0
|
|
||||||
state = self.SHX_STATE_1
|
|
||||||
ol = self.append_bits(out, ol, self.BACK2_STATE1_CODE, self.BACK2_STATE1_CODE_LEN, state) # back to lower case and Set1
|
|
||||||
|
|
||||||
ol = self.append_bits(out, ol, self.RPT_CODE_TASMOTA, self.RPT_CODE_TASMOTA_LEN, 1) # reusing CRLF for RPT
|
|
||||||
ol = self.encodeCount(out, ol, rpt_count - 4)
|
|
||||||
l += rpt_count
|
|
||||||
#l -= 1
|
|
||||||
continue
|
|
||||||
|
|
||||||
if l < (len_ - self.NICE_LEN + 1):
|
|
||||||
#l_old = l
|
|
||||||
(l, ol, state, is_all_upper) = self.matchOccurance(inn, len_, l, out, ol, state, is_all_upper)
|
|
||||||
if l > 0:
|
|
||||||
#print("matchOccurance l = {l} l_old = {lo}".format(l=l,lo=l_old))
|
|
||||||
l += 1 # for loop
|
|
||||||
continue
|
|
||||||
|
|
||||||
l = -l
|
|
||||||
|
|
||||||
if state == self.SHX_STATE_2: # if Set2
|
|
||||||
if ord(' ') <= c_in <= ord('@') or ord('[') <= c_in <= ord('`') or ord('{') <= c_in <= ord('~'):
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
state = self.SHX_STATE_1 # back to Set1 and lower case
|
|
||||||
ol = self.append_bits(out, ol, self.BACK2_STATE1_CODE, self.BACK2_STATE1_CODE_LEN, state)
|
|
||||||
|
|
||||||
is_upper = 0
|
|
||||||
if ord('A') <= c_in <= ord('Z'):
|
|
||||||
is_upper = 1
|
|
||||||
else:
|
|
||||||
if is_all_upper:
|
|
||||||
is_all_upper = 0
|
|
||||||
ol = self.append_bits(out, ol, self.BACK2_STATE1_CODE, self.BACK2_STATE1_CODE_LEN, state)
|
|
||||||
|
|
||||||
if 32 <= c_in <= 126:
|
|
||||||
if is_upper and not is_all_upper:
|
|
||||||
ll = l+5
|
|
||||||
# for (ll=l+5; ll>=l && ll<len_; ll--) {
|
|
||||||
while l <= ll < len_:
|
|
||||||
if inn[ll] < ord('A') or inn[ll] > ord('Z'):
|
|
||||||
break
|
|
||||||
|
|
||||||
ll -= 1
|
|
||||||
|
|
||||||
if ll == l-1:
|
|
||||||
ol = self.append_bits(out, ol, self.ALL_UPPER_CODE, self.ALL_UPPER_CODE_LEN, state) # CapsLock
|
|
||||||
is_all_upper = 1
|
|
||||||
|
|
||||||
if state == self.SHX_STATE_1 and ord('0') <= c_in <= ord('9'):
|
|
||||||
ol = self.append_bits(out, ol, self.SW2_STATE2_CODE, self.SW2_STATE2_CODE_LEN, state) # Switch to sticky Set2
|
|
||||||
state = self.SHX_STATE_2
|
|
||||||
|
|
||||||
c_in -= 32
|
|
||||||
if is_all_upper and is_upper:
|
|
||||||
c_in += 32
|
|
||||||
if c_in == 0 and state == self.SHX_STATE_2:
|
|
||||||
ol = self.append_bits(out, ol, self.ST2_SPC_CODE, self.ST2_SPC_CODE_LEN, state) # space from Set2 ionstead of Set1
|
|
||||||
else:
|
|
||||||
# ol = self.append_bits(out, ol, pgm_read_word(&c_95[c_in]), pgm_read_byte(&l_95[c_in]), state); // original version with c/l in split arrays
|
|
||||||
cl = self.cl_95[c_in]
|
|
||||||
cl_code = cl & 0xFFF0
|
|
||||||
cl_len = cl & 0x000F
|
|
||||||
if cl_len == 13:
|
|
||||||
cl_code = cl_code >> 1
|
|
||||||
ol = self.append_bits(out, ol, cl_code, cl_len, state)
|
|
||||||
|
|
||||||
elif c_in == 10:
|
|
||||||
ol = self.append_bits(out, ol, self.LF_CODE, self.LF_CODE_LEN, state) # LF
|
|
||||||
elif c_in == '\t':
|
|
||||||
ol = self.append_bits(out, ol, self.TAB_CODE, self.TAB_CODE_LEN, state) # TAB
|
|
||||||
else:
|
|
||||||
ol = self.append_bits(out, ol, self.BIN_CODE_TASMOTA, self.BIN_CODE_TASMOTA_LEN, state) # Binary, we reuse the Unicode marker which 3 bits instead of 9
|
|
||||||
ol = self.encodeCount(out, ol, (255 - c_in) & 0xFF)
|
|
||||||
|
|
||||||
|
|
||||||
# check that we have some headroom in the output buffer
|
|
||||||
if ol // 8 >= len_out - 4:
|
|
||||||
return -1 # we risk overflow and crash
|
|
||||||
|
|
||||||
l += 1
|
|
||||||
|
|
||||||
bits = ol % 8
|
|
||||||
if bits:
|
|
||||||
ol = self.append_bits(out, ol, self.TERM_CODE, 8 - bits, 1) # 0011 0111 1100 0000 TERM = 0011 0111 11
|
|
||||||
return (ol + 7) // 8
|
|
||||||
# return ol // 8 + 1 if (ol%8) else 0
|
|
||||||
|
|
||||||
|
|
||||||
def getBitVal(self, inn, bit_no, count):
|
|
||||||
c_in = inn[bit_no >> 3]
|
|
||||||
if bit_no >> 3 and self.ESCAPE_MARKER == inn[(bit_no >> 3) - 1]:
|
|
||||||
c_in -= 1
|
|
||||||
r = 1 << count if (c_in & (0x80 >> (bit_no % 8))) else 0
|
|
||||||
#print("getBitVal r={r}".format(r=r))
|
|
||||||
return r
|
|
||||||
|
|
||||||
# Returns:
|
|
||||||
# 0..11
|
|
||||||
# or -1 if end of stream
|
|
||||||
def getCodeIdx(self, code_type, inn, len_, bit_no_p):
|
|
||||||
code = 0
|
|
||||||
count = 0
|
|
||||||
while count < 5:
|
|
||||||
if bit_no_p >= len_:
|
|
||||||
return -1, bit_no_p
|
|
||||||
# detect marker
|
|
||||||
if self.ESCAPE_MARKER == inn[bit_no_p >> 3]:
|
|
||||||
bit_no_p += 8 # skip marker
|
|
||||||
|
|
||||||
if bit_no_p >= len_:
|
|
||||||
return -1, bit_no_p
|
|
||||||
|
|
||||||
code += self.getBitVal(inn, bit_no_p, count)
|
|
||||||
bit_no_p += 1
|
|
||||||
count += 1
|
|
||||||
code_type_code = code_type[code]
|
|
||||||
if code_type_code and (code_type_code & 0x07) == count:
|
|
||||||
#print("getCodeIdx = {r}".format(r=code_type_code >> 3))
|
|
||||||
return code_type_code >> 3, bit_no_p
|
|
||||||
|
|
||||||
#print("getCodeIdx not found = {r}".format(r=1))
|
|
||||||
return 1, bit_no_p
|
|
||||||
|
|
||||||
def getNumFromBits(self, inn, bit_no_p, count):
|
|
||||||
ret = 0
|
|
||||||
while count:
|
|
||||||
count -= 1
|
|
||||||
if self.ESCAPE_MARKER == inn[bit_no_p >> 3]:
|
|
||||||
bit_no_p += 8 # skip marker
|
|
||||||
ret += self.getBitVal(inn, bit_no_p, count)
|
|
||||||
bit_no_p += 1
|
|
||||||
# print("getNumFromBits = {r}".format(r=ret))
|
|
||||||
return ret, bit_no_p
|
|
||||||
|
|
||||||
def readCount(self, inn, bit_no_p, len_):
|
|
||||||
(idx, bit_no_p) = self.getCodeIdx(self.us_hcode, inn, len_, bit_no_p)
|
|
||||||
if idx >= 1:
|
|
||||||
idx -= 1 # we skip v = 1 (code '0') since we no more accept 2 bits encoding
|
|
||||||
if idx >= 5 or idx < 0:
|
|
||||||
return 0, bit_no_p # unsupported or end of stream
|
|
||||||
till = 0
|
|
||||||
bit_len_idx = 0
|
|
||||||
base = 0
|
|
||||||
#for (uint32_t i = 0; i <= idx; i++) {
|
|
||||||
i = 0
|
|
||||||
while i <= idx:
|
|
||||||
# for i in range(idx):
|
|
||||||
base = till
|
|
||||||
bit_len_idx = self.bit_len[i]
|
|
||||||
till += (1 << bit_len_idx)
|
|
||||||
i += 1
|
|
||||||
|
|
||||||
(count, bit_no_p) = self.getNumFromBits(inn, bit_no_p, bit_len_idx)
|
|
||||||
count = count + base
|
|
||||||
#print("readCount getNumFromBits = {count} ({bl})".format(count=count,bl=bit_len_idx))
|
|
||||||
|
|
||||||
return count, bit_no_p
|
|
||||||
|
|
||||||
def decodeRepeat(self, inn, len_, out, ol, bit_no):
|
|
||||||
#print("decodeRepeat Enter")
|
|
||||||
(dict_len, bit_no) = self.readCount(inn, bit_no, len_)
|
|
||||||
dict_len += self.NICE_LEN
|
|
||||||
(dist, bit_no) = self.readCount(inn, bit_no, len_)
|
|
||||||
dist += self.NICE_LEN - 1
|
|
||||||
#memcpy(out + ol, out + ol - dist, dict_len);
|
|
||||||
i = 0
|
|
||||||
while i < dict_len:
|
|
||||||
#for i in range(dict_len):
|
|
||||||
out[ol + i] = out[ol - dist + i]
|
|
||||||
i += 1
|
|
||||||
ol += dict_len
|
|
||||||
|
|
||||||
return ol, bit_no
|
|
||||||
|
|
||||||
def decompress(self, inn, len_, out, len_out):
|
|
||||||
ol = 0
|
|
||||||
bit_no = 0
|
|
||||||
dstate = self.SHX_SET1
|
|
||||||
is_all_upper = 0
|
|
||||||
|
|
||||||
len_ <<= 3 # *8, len_ in bits
|
|
||||||
out[ol] = 0
|
|
||||||
while bit_no < len_:
|
|
||||||
c = 0
|
|
||||||
is_upper = is_all_upper
|
|
||||||
(v, bit_no) = self.getCodeIdx(self.us_vcode, inn, len_, bit_no) # read vCode
|
|
||||||
#print("bit_no {b}. v = {v}".format(b=bit_no,v=v))
|
|
||||||
if v < 0:
|
|
||||||
break # end of stream
|
|
||||||
h = dstate # Set1 or Set2
|
|
||||||
if v == 0: # Switch which is common to Set1 and Set2, first entry
|
|
||||||
(h, bit_no) = self.getCodeIdx(self.us_hcode, inn, len_, bit_no) # read hCode
|
|
||||||
#print("bit_no {b}. h = {h}".format(b=bit_no,h=h))
|
|
||||||
if h < 0:
|
|
||||||
break # end of stream
|
|
||||||
if h == self.SHX_SET1: # target is Set1
|
|
||||||
if dstate == self.SHX_SET1: # Switch from Set1 to Set1 us UpperCase
|
|
||||||
if is_all_upper: # if CapsLock, then back to LowerCase
|
|
||||||
is_upper = 0
|
|
||||||
is_all_upper = 0
|
|
||||||
continue
|
|
||||||
|
|
||||||
(v, bit_no) = self.getCodeIdx(self.us_vcode, inn, len_, bit_no) # read again vCode
|
|
||||||
if v < 0:
|
|
||||||
break # end of stream
|
|
||||||
if v == 0:
|
|
||||||
(h, bit_no) = self.getCodeIdx(self.us_hcode, inn, len_, bit_no) # read second hCode
|
|
||||||
if h < 0:
|
|
||||||
break # end of stream
|
|
||||||
if h == self.SHX_SET1: # If double Switch Set1, the CapsLock
|
|
||||||
is_all_upper = 1
|
|
||||||
continue
|
|
||||||
|
|
||||||
is_upper = 1 # anyways, still uppercase
|
|
||||||
else:
|
|
||||||
dstate = self.SHX_SET1 # if Set was not Set1, switch to Set1
|
|
||||||
continue
|
|
||||||
|
|
||||||
elif h == self.SHX_SET2: # If Set2, switch dstate to Set2
|
|
||||||
if dstate == self.SHX_SET1:
|
|
||||||
dstate = self.SHX_SET2
|
|
||||||
continue
|
|
||||||
|
|
||||||
if h != self.SHX_SET1: # all other Sets (why not else)
|
|
||||||
(v, bit_no) = self.getCodeIdx(self.us_vcode, inn, len_, bit_no) # we changed set, now read vCode for char
|
|
||||||
if v < 0:
|
|
||||||
break # end of stream
|
|
||||||
|
|
||||||
if v == 0 and h == self.SHX_SET1A:
|
|
||||||
#print("v = 0, h = self.SHX_SET1A")
|
|
||||||
if is_upper:
|
|
||||||
(temp, bit_no) = self.readCount(inn, bit_no, len_)
|
|
||||||
out[ol] = 255 - temp # binary
|
|
||||||
ol += 1
|
|
||||||
else:
|
|
||||||
(ol, bit_no) = self.decodeRepeat(inn, len_, out, ol, bit_no) # dist
|
|
||||||
continue
|
|
||||||
|
|
||||||
if h == self.SHX_SET1 and v == 3:
|
|
||||||
# was Unicode, will do Binary instead
|
|
||||||
(temp, bit_no) = self.readCount(inn, bit_no, len_)
|
|
||||||
out[ol] = 255 - temp # binary
|
|
||||||
ol += 1
|
|
||||||
continue
|
|
||||||
|
|
||||||
if h < 7 and v < 11:
|
|
||||||
#print("h {h} v {v}".format(h=h,v=v))
|
|
||||||
c = ord(self.sets[h][v])
|
|
||||||
if ord('a') <= c <= ord('z'):
|
|
||||||
if is_upper:
|
|
||||||
c -= 32 # go to UpperCase for letters
|
|
||||||
else: # handle all other cases
|
|
||||||
if is_upper and dstate == self.SHX_SET1 and v == 1:
|
|
||||||
c = ord('\t') # If UpperCase Space, change to TAB
|
|
||||||
if h == self.SHX_SET1B:
|
|
||||||
if 8 == v: # was LF or RPT, now only LF # pylint: disable=misplaced-comparison-constant
|
|
||||||
out[ol] = ord('\n')
|
|
||||||
ol += 1
|
|
||||||
continue
|
|
||||||
|
|
||||||
if 9 == v: # was CRLF, now RPT # pylint: disable=misplaced-comparison-constant
|
|
||||||
(count, bit_no) = self.readCount(inn, bit_no, len_)
|
|
||||||
count += 4
|
|
||||||
if ol + count >= len_out:
|
|
||||||
return -1 # overflow
|
|
||||||
|
|
||||||
rpt_c = out[ol - 1]
|
|
||||||
while count:
|
|
||||||
count -= 1
|
|
||||||
out[ol] = rpt_c
|
|
||||||
ol += 1
|
|
||||||
continue
|
|
||||||
|
|
||||||
if 10 == v: # pylint: disable=misplaced-comparison-constant
|
|
||||||
break # TERM, stop decoding
|
|
||||||
|
|
||||||
out[ol] = c
|
|
||||||
ol += 1
|
|
||||||
|
|
||||||
if ol >= len_out:
|
|
||||||
return -1 # overflow
|
|
||||||
|
|
||||||
return ol
|
|
||||||
|
|
||||||
# pylint: enable=missing-function-docstring
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
# pylint: disable=line-too-long
|
|
||||||
UNISHOX = Unishox()
|
|
||||||
BYTES_ = bytearray(2048)
|
|
||||||
INN = bytearray(b'ON Switch1#State==1 DO Add1 1 ENDON ON Var1#State==0 DO ShutterStop1 ENDON ON Var1#State==1 DO ShutterClose1 ENDON ON Var1#State>=2 DO Var1 0 ENDON ON Shutter1#Close DO Var1 0 ENDON ON Switch2#State==1 DO Add2 1 ENDON ON Var2#State==0 DO ShutterStop1 ENDON ON Var2#State==1 DO ShutterOpen1 ENDON ON Var2#State>=2 DO Var2 0 ENDON ON Shutter1#Open DO Var2 0 ENDON')
|
|
||||||
LEN_ = UNISHOX.compress(INN, len(INN), BYTES_, len(BYTES_))
|
|
||||||
print("Compressed from {fromm} to {to} ({p}%)".format(fromm=len(INN), to=LEN_, p=(100-LEN_/len(INN)*100)))
|
|
||||||
|
|
||||||
OUT = bytearray(2048)
|
|
||||||
LEN_ = UNISHOX.decompress(BYTES_, LEN_, OUT, len(OUT))
|
|
||||||
print(str(OUT, 'utf-8').split('\x00')[0])
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user