Skip to content

Commit e102872

Browse files
committed
Merge branch 'development' into influxdb_period
2 parents e18700c + a479d45 commit e102872

11 files changed

+17
-16
lines changed

docs/Commands.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ A `Backlog` command without an argument clears an possible existing `Backlog` qu
104104

105105
!!! warning
106106
If you're using Tasmota versions earlier current release some of the commands might not work.
107-
Availability of some features and their associated commands depend on the firmware build. Please consult the [builds](Builds) table for a reference of which features are available for each firmware variant.
107+
Availability of some features and their associated commands depend on the firmware build. Please consult the [builds](Firmware-Builds) table for a reference of which features are available for each firmware variant.
108108

109109
!!! note
110110
Almost all settings using string parameters (except `Rule` and `MqttFingerprint`) share a common area with max 698 chars, i.e. the total length of all these parameters is limited to this size (you will be noted if this limit is exceeded).
@@ -157,7 +157,7 @@ Gpios<a class="cmnd" id="gpios"></a>|Show list of available [components](Compone
157157
Gpio<a class="cmnd" id="gpio"></a>|Show current [component](Components#gpio-conversion) assignments of the Module's configurable GPIO<BR>`255` / `All` Show [component](Components#gpio-conversion) assignments for all the devices available GPIO<BR>
158158
Gpio<x\><a class="cmnd" id="gpiox"></a>|`<component>` = assign a [component](Components) to `Gpio<x>`
159159
I2Cscan<a class="cmnd" id="i2cscan"></a>|Scan I<sup>2</sup>C bus and show addresses for found devices
160-
I2CDriver<a class="cmnd" id="i2cdriver"></a>|Enable / Disable I<sup>2</sup>C sensor drivers. [Read more...](I2CDevices)<BR>
160+
I2CDriver<a class="cmnd" id="i2cdriver"></a>|Enable / Disable I<sup>2</sup>C sensor drivers. [Read more...](I2CDEVICES)<BR>
161161
LogHost<a class="cmnd" id="loghost"></a>|`1` = reset [syslog](https://www.sigmdel.ca/michel/ha/rpi/syslog_en.html) host to firmware default (`SYS_LOG_HOST`)<BR>`<value>` = set syslog host
162162
LogPort<a class="cmnd" id="logport"></a>|`1` = reset [syslog](https://www.sigmdel.ca/michel/ha/rpi/syslog_en.html) port to firmware default (`SYS_LOG_PORT`)<BR>`2..32766` = set syslog port
163163
Modules<a class="cmnd" id="modules"></a>|Show available modules by name and index

docs/FAQ.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ In case you're using a template you created yourself or found in our Templates R
206206

207207
### Sensors do not show values
208208
Make sure your sensor is properly wired and the GPIOs assigned.
209-
Your vanilla `tasmota.bin` doesn't have complete sensor support. Make sure you've installed tasmota-sensors.bin that support the largest number of sensors. Some sensors require enabling in the code and compiling your own binary. See [Builds](Builds) for a comprehensive list of supported components.
209+
Your vanilla `tasmota.bin` doesn't have complete sensor support. Make sure you've installed tasmota-sensors.bin that support the largest number of sensors. Some sensors require enabling in the code and compiling your own binary. See [Builds](Firmware-Builds) for a comprehensive list of supported components.
210210

211211
### Timers trigger at the wrong time
212212
Tasmota devices must have a their time of day set properly in order for **any** timers to work properly. Check the log in the web UI Console to see if the device's time is set correctly. There are two elements to setting the time: 1. obtaining the UTC time, and, 2. local Daylight Saving Time policies.

docs/Getting-Started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Tasmota installed from a precompiled binary needs to be configured to work with
4747

4848
### Needed Software
4949
#### Tasmota Firmware Binary
50-
Download a Tasmota firmware binary file (.bin). If you're not sure which binary is the right one for you just start with `tasmota.bin` or consult the [builds table](Builds) to see which features you need.
50+
Download a Tasmota firmware binary file (.bin). If you're not sure which binary is the right one for you just start with `tasmota.bin` or consult the [builds table](Firmware-Builds) to see which features you need.
5151

5252
Official release binaries can be downloaded from [firmware server](http://ota.tasmota.com/tasmota/release/).
5353

docs/Gitpod.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ To modify the stock configuration:
3939

4040
1. Select the `/tasmota` folder in the Explorer (1) pane
4141
2. Create a new file called `user_config_override.h`
42-
3. In the Editor (2) pane, add, change, or remove anything you need in your configuration file to define your own settings. Refer to the `user_config_override_sample.h` file as well as `my_user_config.h` for `#define` options ([sample](https://pastebin.com/M5KPPWAJ)). You can find a list of Tasmota features and settings listed [here](Builds). Define the features you require in your configuration file.
42+
3. In the Editor (2) pane, add, change, or remove anything you need in your configuration file to define your own settings. Refer to the `user_config_override_sample.h` file as well as `my_user_config.h` for `#define` options ([sample](https://pastebin.com/M5KPPWAJ)). You can find a list of Tasmota features and settings listed in the [builds table](Firmware-Builds). Define the features you require in your configuration file.
4343
4. Click 'File' on the menu bar and 'Save' your edits.
4444

4545
### Prepare the IDE for Compilation

docs/Peripherals.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Assign a [component](Components) to a GPIO.
2424

2525
- `GPIO14 2` configures sensor AM2301 to GPIO14_
2626
- `Backlog GPIO14 5; GPIO4 6` sets I<sup>2</sup>C SCL to GPIO14 and I<sup>2</sup>C SDA to GPIO4
27-
Tasmota will auto-detect all connected and supported I<sup>2</sup>C devices. If you have conflicting I<sup>2</sup>C addresses see [I2CDevices](I2CDevices)
27+
Tasmota will auto-detect all connected and supported I<sup>2</sup>C devices. If you have conflicting I<sup>2</sup>C addresses see [I2CDevices](I2CDEVICES)
2828

2929
_[`GPIOs All`](Commands.md#gpios) shows list of all available components by name and index_
3030

docs/PlatformIO-CLI.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Either download the latest Tasmota Source code from https://github.com/arendst/T
1414
`git clone https://github.com/arendst/Tasmota.git`
1515

1616
## Select the environment
17-
The default environment configuration can be used to easily generate Tasmota firmware variants (tasmota, sensors, display, etc.). If you're not sure which binary is the right one for you, consult the [builds table](Builds) or just start with `tasmota.bin`. To build and/or flash exactly one of these, use the `-e` command line argument (e.g., `-e tasmota-sensors`).
17+
The default environment configuration can be used to easily generate Tasmota firmware variants (tasmota, sensors, display, etc.). If you're not sure which binary is the right one for you, consult the [builds table](Firmware-Builds) or just start with `tasmota.bin`. To build and/or flash exactly one of these, use the `-e` command line argument (e.g., `-e tasmota-sensors`).
1818

1919
# Compile and upload
2020
Once all the prerequisites are in place, compiling and uploading is one simple command. Execute this from within the `Tasmota` source code directory:

docs/Rules.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Tasmota provides a Rule feature heavily inspired by the _ESPEasy_ implementation
55
Rules perform actions based on triggers (e.g., switch state change, temperature threshold, events like system boot, a defined timer elapsing, custom defined events, etc.) They are stored in flash and therefore will survive a reboot.
66

77
!!! note
8-
Most pre-compiled [builds](Builds) have the Rules feature enabled. *If you are >compiling your own firmware, in order to use rules, include `#define USE_RULES` in `user_config_override.h`.*
8+
Most pre-compiled [builds](Firmware-Builds) have the Rules feature enabled. *If you are >compiling your own firmware, in order to use rules, include `#define USE_RULES` in `user_config_override.h`.*
99

1010
**List of [Rules Commands](Commands.md#rules)**
1111

docs/SPS30.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPS30 Particulate sensor
22

3-
!!! info "This feature is **not** included in any prebuilt Tasmota variant (check [BUILDS.md](https://github.com/arendst/Tasmota/blob/development/BUILDS.md))"
3+
!!! info "This feature is **not** included in any prebuilt Tasmota variant (check [builds](Firmware-Builds))"
44

55
You must [compile your build](Compile-your-build). Add the following to `user_config_override.h`:
66
```cpp

docs/Upgrading.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ In other words, ensure that there is a good reason to mess with a working instal
99
!!! tip "Backup before upgrading"
1010
Any time you upgrade it is highly recommended to [back up your device settings](#backing-up-settings). That is easily done from the webUI using **Configuration - Backup Config**.
1111

12-
If you wish to switch to a different [build](Builds) or use development branch you need to download a binary file (gzipped or regular) or change the ***OTA Url*** link.
12+
If you wish to switch to a different [build](Firmware-Builds) or use development branch you need to download a binary file (gzipped or regular) or change the ***OTA Url*** link.
1313

1414
Download binaries from:
1515

docs/devices/Sonoff-RF-Bridge-433.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The RF upgrade requires wiring the bridge and then flashing the firmware via the
3939
<img src="https://github.com/arendst/arendst.github.io/raw/master/media/sonoff_bridge_rffw_upgrade.png" width="300">
4040

4141
#### Flashing RF Firmware
42-
1. Make sure you have previously flashed a Tasmota binary built with `RF_FLASH`. Refer to the [builds table](https://github.com/arendst/Tasmota/blob/development/BUILDS.md) for pre-compiled binaries which include this feature. Otherwise the "Magic byte is not 0xE9" error will occur.
42+
1. Make sure you have previously flashed a Tasmota binary built with `RF_FLASH`. Refer to the [builds table](../Firmware-Builds) for pre-compiled binaries which include this feature. Otherwise the "Magic byte is not 0xE9" error will occur.
4343
2. Set the module type to `Sonoff Bridge (25)`
4444
3. Connect two wires (this will be different depending on the `Sonoff RF Bridge 433` hardware version):
4545
- For `R1`: Connect `GPIO4 to C2Ck` and `GPIO5 to C2D`.

mkdocs.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ extra:
7474
link: 'https://t.me/tasmota'
7575
- icon: fontawesome/brands/github-alt
7676
link: 'https://github.com/tasmota'
77+
analytics:
78+
provider: google
79+
property: G-8J08F8X90S
80+
7781
markdown_extensions:
7882
- admonition
7983
- toc:
@@ -91,14 +95,11 @@ markdown_extensions:
9195
- pymdownx.keys
9296
- pymdownx.mark
9397
- pymdownx.superfences
94-
- pymdownx.snipp ets
98+
- pymdownx.snippets
9599
- pymdownx.tilde
96100
- meta
97101
- def_list
98102

99-
google_analytics:
100-
- 'UA-140681905-2'
101-
- 'auto'
102103

103104
extra_css:
104105
- 'assets/css/anchor-fix.css'
@@ -130,7 +131,7 @@ nav:
130131
- Device-Groups.md
131132
- Displays.md
132133
- Dynamic-Sleep.md
133-
- I2C Devices: I2CDevices.md
134+
- I2C Devices: I2CDEVICES.md
134135
- IR Communication: Tasmota-IR.md
135136
- LCD/DLP Projector Control: Projector.md
136137
- Lights.md

0 commit comments

Comments
 (0)