From cb3f6c75fc00c9297bea7ffb3beaf057c72e0f15 Mon Sep 17 00:00:00 2001 From: blakadder Date: Sat, 9 Nov 2019 03:09:01 +0100 Subject: [PATCH 1/2] fixed old links to wiki --- RELEASENOTES.md | 2 +- tasmota/_changelog.ino | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 2a34e5fca..6bb9e7c3a 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -3,7 +3,7 @@ # RELEASE NOTES ## 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** 2. Migrate to **Sonoff-Tasmota 4.x** diff --git a/tasmota/_changelog.ino b/tasmota/_changelog.ino index e715dd96b..87923a038 100644 --- a/tasmota/_changelog.ino +++ b/tasmota/_changelog.ino @@ -615,7 +615,7 @@ * Revert sonoff-minimal removals causing failure of wifi connection (#3177) * * 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 number of supported switches from 4 to 8 (#2885, #3086) * Change BME680 driver from Adafruit to Bosch BME680 library (#2969) From 8f64d1307483ea8585349a35d2179d90c56c3e4b Mon Sep 17 00:00:00 2001 From: blakadder Date: Sat, 9 Nov 2019 03:56:30 +0100 Subject: [PATCH 2/2] sonoff -> tasmota in docker container --- build-container/README.md | 6 +++--- build-container/entrypoint.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-container/README.md b/build-container/README.md index b89a84892..64754f4f1 100644 --- a/build-container/README.md +++ b/build-container/README.md @@ -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. ## 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` ## Build a specific binary with custom options 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: -`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 +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` Now you should have the file Tasmota/.pioenvs/sonoff-DE/firmware.bin which can be flashed on your device. diff --git a/build-container/entrypoint.sh b/build-container/entrypoint.sh index 6bdf2dea6..8be6c11be 100644 --- a/build-container/entrypoint.sh +++ b/build-container/entrypoint.sh @@ -2,7 +2,7 @@ #!/bin/bash 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 cd $TASMOTA_VOLUME