mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6876 from blakadder/development 

fixed old links to wiki
This commit is contained in:
Theo Arends 2019-11-09 10:17:05 +01:00 committed by GitHub
parent 697c600387 8f64d13074
commit a0454a93cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASENOTES.md
View File

@ -3,7 +3,7 @@
# RELEASE NOTES # RELEASE NOTES
## Migration Information ## Migration Information
See [wiki migration path](https://github.com/arendst/Tasmota/wiki/Upgrade#migration-path) for instructions how to migrate to a major version. Pay attention to the following version breaks due to dynamic settings updates: See [wiki migration path](https://github.com/arendst/Tasmota/wiki/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** 1. Migrate to **Sonoff-Tasmota 3.9.x**
2. Migrate to **Sonoff-Tasmota 4.x** 2. Migrate to **Sonoff-Tasmota 4.x**

6
build-container/README.md
View File

@ -8,13 +8,13 @@ This Container will setup a proper build environment for [Tasmota](https://githu
Use instead of the container `mytasmota:latest` the published container `eddyhub/docker-tasmota:latest` from docker hub. Use instead of the container `mytasmota:latest` the published container `eddyhub/docker-tasmota:latest` from docker hub.
## Build all development binaries ## Build all development binaries
`git clone https://github.com/arendst/Tasmota.git` `git clone https://github.com/arendst/Tasmota.git`
`docker run -ti --rm -v $(pwd)/Tasmota:/tasmota -u $UID:$GID mytasmota:latest` `docker run -ti --rm -v $(pwd)/Tasmota:/tasmota -u $UID:$GID mytasmota:latest`
## Build a specific binary with custom options ## Build a specific binary with custom options
Checkout Tasmota: `git clone https://github.com/arendst/Tasmota.git` Checkout Tasmota: `git clone https://github.com/arendst/Tasmota.git`
Mount the source as volume in `/tasmota`. **Prefix** any parameter available in `Tasmota/sonoff/my_user_config.h` with `TASMOTA_` as a environment variable for the container. **Also don't forget to escape what needs to be escaped in your shell.** **Strings** should be in **double quotes**. My config example: Mount the source as volume in `/tasmota`. **Prefix** any parameter available in `Tasmota/sonoff/my_user_config.h` with `TASMOTA_` as a environment variable for the container. **Also don't forget to escape what needs to be escaped in your shell.** **Strings** should be in **double quotes**. My config example:
`docker run -ti --rm -v $(pwd)/Tasmota:/tasmota -e TASMOTA_STA_SSID1='"my-wifi"' -e TASMOTA_STA_PASS1='"my-wifi-password"' -e TASMOTA_MQTT_HOST='my-mqtt-host' -e TASMOTA_MQTT_USER='"my-mqtt-user"' -e TASMOTA_MQTT_PASS='"my-mqtt-password"' -e TASMOTA_WEB_PASSWORD='"my-web-password"' -u $UID:$GID mytasmota:latest --environment sonoff-DE `docker run -ti --rm -v $(pwd)/Tasmota:/tasmota -e TASMOTA_STA_SSID1='"my-wifi"' -e TASMOTA_STA_PASS1='"my-wifi-password"' -e TASMOTA_MQTT_HOST='my-mqtt-host' -e TASMOTA_MQTT_USER='"my-mqtt-user"' -e TASMOTA_MQTT_PASS='"my-mqtt-password"' -e TASMOTA_WEB_PASSWORD='"my-web-password"' -u $UID:$GID mytasmota:latest --environment sonoff-DE`
Now you should have the file Tasmota/.pioenvs/sonoff-DE/firmware.bin which can be flashed on your device. Now you should have the file Tasmota/.pioenvs/sonoff-DE/firmware.bin which can be flashed on your device.

2
build-container/entrypoint.sh
View File

@ -2,7 +2,7 @@
#!/bin/bash #!/bin/bash
TASMOTA_VOLUME='/tasmota' TASMOTA_VOLUME='/tasmota'
USER_CONFIG_OVERRIDE="${TASMOTA_VOLUME}/sonoff/user_config_override.h" USER_CONFIG_OVERRIDE="${TASMOTA_VOLUME}/tasmota/user_config_override.h"
if [ -d $TASMOTA_VOLUME ]; then if [ -d $TASMOTA_VOLUME ]; then
cd $TASMOTA_VOLUME cd $TASMOTA_VOLUME

2
tasmota/_changelog.ino
View File

@ -616,7 +616,7 @@
* Revert sonoff-minimal removals causing failure of wifi connection (#3177) * Revert sonoff-minimal removals causing failure of wifi connection (#3177)
* *
* 6.1.0 20180706 * 6.1.0 20180706
* Remove version 3, 4 and pre 5.2 settings auto-upgrade. See https://github.com/arendst/Tasmota/wiki/Upgrade#migration-path * Remove version 3, 4 and pre 5.2 settings auto-upgrade. See https://github.com/arendst/Tasmota/wiki/Upgrading#migration-path
* Change default CFG_HOLDER from 0x20161209 to 4617 (=0x1209) - no impact on default upgrades * Change default CFG_HOLDER from 0x20161209 to 4617 (=0x1209) - no impact on default upgrades
* Change number of supported switches from 4 to 8 (#2885, #3086) * Change number of supported switches from 4 to 8 (#2885, #3086)
* Change BME680 driver from Adafruit to Bosch BME680 library (#2969) * Change BME680 driver from Adafruit to Bosch BME680 library (#2969)