Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-27 19:57:38 +00:00
Code Issues Releases Activity

[ESP32 factory] Change -factory.bin to .factory.bin

Browse Source
This commit is contained in:
TD-er
2022-02-08 13:00:46 +01:00
parent ac97fee69e
commit 2c933e5a42
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/README.txt
Vendored
+3 -3
View File
@@ -73,12 +73,12 @@ Ethernet support is included in similar builds as mentioned before, only ending
Since ESP32 does have its flash partitioned in several blocks, we have 2 bin files of each ESP32 build:
- test_ESP32_4M316k.bin
- test_ESP32_4M316k-factory.bin
- test_ESP32_4M316k.factory.bin
The binary with "-factory" in the name must be flashed on a new node, via the serial interface of the board.
The binary with ".factory" in the name must be flashed on a new node, via the serial interface of the board.
This flash must be started at address 0.
The binary without "-factory" can be used for OTA updates. (OTA for ESP32 is added in May 2020)
The binary without ".factory" can be used for OTA updates. (OTA for ESP32 is added in May 2020)
Please note that changing between those versions will destroy the settings!
docs/source/Participate/ProjectStructure.rst
+3 -3
View File
@@ -189,12 +189,12 @@ There are several builds for ESP32:
Since ESP32 does have its flash partitioned in several blocks, we have 2 bin files of each ESP32 build, f.e.:
* ``test_D_ESP32_4M316k.bin`` Use for OTA upgrades.
* ``test_D_ESP32_4M316k-factory.bin`` Use on clean nodes as initial inistall.
* ``test_D_ESP32_4M316k.factory.bin`` Use on clean nodes as initial inistall.
The binary with ``-factory`` in the name must be flashed on a new node, via the serial interface of the board.
The binary with ``.factory`` in the name must be flashed on a new node, via the serial interface of the board.
This flash must be started at address 0.
The binary without ``-factory`` can be used for OTA updates. (OTA for ESP32 is added in May 2020)
The binary without ``.factory`` can be used for OTA updates. (OTA for ESP32 is added in May 2020)
Blank Images
tools/create_index.sh
+11 -11
View File
@@ -65,47 +65,47 @@ echo "<!DOCTYPE html>
</p>
<select>
<optgroup label=\"ESP8285\">"
find . |grep ${BUILD}|grep manifest.json|grep -i esp8285|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/-factory</</g'|sed 's/\ bin\//\ /g'
find . |grep ${BUILD}|grep manifest.json|grep -i esp8285|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/.factory</</g'|sed 's/\ bin\//\ /g'
echo " </optgroup>"
echo " <optgroup label=\"ESP8266-1M\">"
find . |grep ${BUILD}|grep manifest.json|grep -iv esp32|grep -iv esp8285|grep _1M|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/-factory</</g'|sed 's/\ bin\//\ /g'
find . |grep ${BUILD}|grep manifest.json|grep -iv esp32|grep -iv esp8285|grep _1M|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/.factory</</g'|sed 's/\ bin\//\ /g'
echo " </optgroup>"
echo " <optgroup label=\"ESP8266-2M\">"
find . |grep ${BUILD}|grep manifest.json|grep -iv esp32|grep -iv esp8285|grep _2M|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/-factory</</g'|sed 's/\ bin\//\ /g'
find . |grep ${BUILD}|grep manifest.json|grep -iv esp32|grep -iv esp8285|grep _2M|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/.factory</</g'|sed 's/\ bin\//\ /g'
echo " </optgroup>"
echo " <optgroup label=\"ESP8266-4M\">"
find . |grep ${BUILD}|grep manifest.json|grep -iv esp32|grep -iv esp8285|grep _4M|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/-factory</</g'|sed 's/\ bin\//\ /g'
find . |grep ${BUILD}|grep manifest.json|grep -iv esp32|grep -iv esp8285|grep _4M|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/.factory</</g'|sed 's/\ bin\//\ /g'
echo " </optgroup>"
echo " <optgroup label=\"ESP8266-16M\">"
find . |grep ${BUILD}|grep manifest.json|grep -iv esp32|grep -iv esp8285|grep _16M|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/-factory</</g'|sed 's/\ bin\//\ /g'
find . |grep ${BUILD}|grep manifest.json|grep -iv esp32|grep -iv esp8285|grep _16M|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/.factory</</g'|sed 's/\ bin\//\ /g'
echo " </optgroup>"
echo " <optgroup label=\"ESP32-4M\">"
find . |grep ${BUILD}|grep manifest.json|grep -i esp32|grep -iv esp32s2|grep _4M|grep -v ETH|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/-factory</</g'|sed 's/\ bin\//\ /g'
find . |grep ${BUILD}|grep manifest.json|grep -i esp32|grep -iv esp32s2|grep _4M|grep -v ETH|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/.factory</</g'|sed 's/\ bin\//\ /g'
echo " </optgroup>"
echo " <optgroup label=\"ESP32-16M\">"
find . |grep ${BUILD}|grep manifest.json|grep -i esp32|grep -iv esp32s2|grep _16M|grep -v ETH|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/-factory</</g'|sed 's/\ bin\//\ /g'
find . |grep ${BUILD}|grep manifest.json|grep -i esp32|grep -iv esp32s2|grep _16M|grep -v ETH|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/.factory</</g'|sed 's/\ bin\//\ /g'
echo " </optgroup>"
echo " <optgroup label=\"ESP32-4M ETH\">"
find . |grep ${BUILD}|grep manifest.json|grep -i esp32|grep -iv esp32s2|grep _4M|grep ETH|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/-factory</</g'|sed 's/\ bin\//\ /g'
find . |grep ${BUILD}|grep manifest.json|grep -i esp32|grep -iv esp32s2|grep _4M|grep ETH|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/.factory</</g'|sed 's/\ bin\//\ /g'
echo " </optgroup>"
echo " <optgroup label=\"ESP32-16M ETH\">"
find . |grep ${BUILD}|grep manifest.json|grep -i esp32|grep -iv esp32s2|grep _16M|grep ETH|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/-factory</</g'|sed 's/\ bin\//\ /g'
find . |grep ${BUILD}|grep manifest.json|grep -i esp32|grep -iv esp32s2|grep _16M|grep ETH|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/.factory</</g'|sed 's/\ bin\//\ /g'
echo " </optgroup>"
echo " <optgroup label=\"ESP32-S2-4M\">"
find . |grep ${BUILD}|grep manifest.json|grep -i esp32s2|grep _4M|grep -v ETH|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/-factory</</g'|sed 's/\ bin\//\ /g'
find . |grep ${BUILD}|grep manifest.json|grep -i esp32s2|grep _4M|grep -v ETH|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/.factory</</g'|sed 's/\ bin\//\ /g'
echo " </optgroup>"
echo " <optgroup label=\"Hardware Specific\">"
find . |grep ${BUILD}|grep manifest.json|grep -i hard_|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/-factory</</g'|sed 's/\ bin\//\ /g'
find . |grep ${BUILD}|grep manifest.json|grep -i hard_|sort -n|grep -v dummy|cut -d '/' -f2-|xargs -n1 -I {} echo "<option value=\"{}\" > {}</option>" |sed 's/\ static\// /g'|sed 's/.manifest.json</</g'|sed 's/.factory</</g'|sed 's/\ bin\//\ /g'
echo " </optgroup>"
tools/pio/copy_files.py
+4 -4
View File
@@ -71,14 +71,14 @@ def generate_webflash_json_manifest(variant, file_suffix):
manifest_suff = ''
add_improve = True
if "-factory.bin" in file_suffix:
if ".factory.bin" in file_suffix:
if 'ESP32s2' in variant:
chipFamily = 'ESP32-S2'
manifest_suff = '-factory.manifest.json'
manifest_suff = '.factory.manifest.json'
else:
if 'ESP32' in variant:
chipFamily = 'ESP32'
manifest_suff = '-factory.manifest.json'
manifest_suff = '.factory.manifest.json'
else:
if ".bin" in file_suffix and ".gz" not in file_suffix and 'ESP32' not in variant:
chipFamily = 'ESP8266'
@@ -122,7 +122,7 @@ def bin_elf_copy(source, target, env):
if not os.path.isdir("{}{}".format(OUTPUT_DIR, d)):
os.mkdir("{}{}".format(OUTPUT_DIR, d))
for suff in [".elf", ".bin", ".bin.gz", "-factory.bin", ".env.txt"]:
for suff in [".elf", ".bin", ".bin.gz", ".factory.bin", ".env.txt"]:
copy_to_build_output(split_path[0], variant, suff)
import datetime
tools/pio/post_esp32.py
+1 -1
View File
@@ -59,7 +59,7 @@ def esp32_create_combined_bin(source, target, env):
print(f" - {hex(app_offset)} | {firmware_name}")
cmd += [hex(app_offset), firmware_name]
print('Using esptool.py arguments: %s' % ' '.join(cmd))
# print('Using esptool.py arguments: %s' % ' '.join(cmd))
esptool.main(cmd)