From 2c933e5a42eff077e01532020325fb59df5866f0 Mon Sep 17 00:00:00 2001
From: TD-er <gijs.noorlander@gmail.com>
Date: Fri, 7 Jan 2022 00:03:13 +0100
Subject: [PATCH] [ESP32 factory] Change -factory.bin to .factory.bin

---
 dist/README.txt                              |  6 +++---
 docs/source/Participate/ProjectStructure.rst |  6 +++---
 tools/create_index.sh                        | 22 ++++++++++----------
 tools/pio/copy_files.py                      |  8 +++----
 tools/pio/post_esp32.py                      |  2 +-
 5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/dist/README.txt b/dist/README.txt
index 9405875f0..5b6622405 100644
--- a/dist/README.txt
+++ b/dist/README.txt
@@ -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!
diff --git a/docs/source/Participate/ProjectStructure.rst b/docs/source/Participate/ProjectStructure.rst
index 960aab774..db4fcd446 100644
--- a/docs/source/Participate/ProjectStructure.rst
+++ b/docs/source/Participate/ProjectStructure.rst
@@ -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
diff --git a/tools/create_index.sh b/tools/create_index.sh
index 8e430f29a..82283d38b 100644
--- a/tools/create_index.sh
+++ b/tools/create_index.sh
@@ -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>"
 
diff --git a/tools/pio/copy_files.py b/tools/pio/copy_files.py
index 10d194361..44a905903 100644
--- a/tools/pio/copy_files.py
+++ b/tools/pio/copy_files.py
@@ -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
diff --git a/tools/pio/post_esp32.py b/tools/pio/post_esp32.py
index 9f6a5454d..428fd6669 100644
--- a/tools/pio/post_esp32.py
+++ b/tools/pio/post_esp32.py
@@ -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)
 
