Beta v0.16.025

Author: melkati

.github/workflows/release3.yml

@@ -231,14 +231,56 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      # ------------------------------------------------------------------
+      # Ensure the remote directory chain exists before uploading.
+      # See release3_beta.yml for the full explanation (issue #300): the
+      # FTP account root is the web server root (public_html), NOT chrooted
+      # to the firmware directory, and the old FTP-Deploy-Action can fail
+      # silently to create missing nested directories.
+      # ------------------------------------------------------------------
+      - name: Ensure remote FTP directory exists
+        env:
+          FTP_SERVER: ${{ secrets.FTP_SERVER }}
+          FTP_USERNAME: ${{ secrets.FTP_USER }}
+          FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
+          REPO_NAME: ${{ github.event.repository.name }}
+        run: |
+          python - <<'PY'
+          import ftplib
+          import os
+          from urllib.parse import urlparse
+
+          raw_server = os.environ["FTP_SERVER"].strip()
+          parsed = urlparse(raw_server if "://" in raw_server else f"ftp://{raw_server}")
+          host = parsed.hostname or raw_server
+          port = parsed.port or 21
+
+          ftp = ftplib.FTP()
+          ftp.connect(host, port, timeout=20)
+          ftp.login(os.environ["FTP_USERNAME"], os.environ["FTP_PASSWORD"])
+
+          target = f"/wp-content/uploads/firmware/{os.environ['REPO_NAME']}"
+          parts = [p for p in target.split("/") if p]
+          path = ""
+          for part in parts:
+              path += "/" + part
+              try:
+                  ftp.mkd(path)
+                  print(f"Created: {path}")
+              except ftplib.error_perm:
+                  print(f"Already exists: {path}")
+
+          ftp.quit()
+          PY
+
       - name: FTP Deploy .bin files to emariete.com
         uses: SamKirkland/FTP-Deploy-Action@2.0.0
         env:
           FTP_SERVER: ${{ secrets.FTP_SERVER }}
           FTP_USERNAME: ${{ secrets.FTP_USER }}
           FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
           LOCAL_DIR: ./ftp_firmware/
-          REMOTE_DIR: /${{ github.event.repository.name }}/
+          REMOTE_DIR: /wp-content/uploads/firmware/${{ github.event.repository.name }}/
           METHOD: ftp
           PORT: 21
           ARGS: --verbose

.github/workflows/release3_beta.yml

@@ -245,16 +245,23 @@ jobs:
           commit_message: "Beta v${{ steps.get_version.outputs.VERSION }} manifests"
 
       # ------------------------------------------------------------------
-      # STEP 2: Inspect the FTP account root before uploading.
-      # This is intentionally verbose and must not print credentials. It
-      # tells us whether the account is rooted at /public_html or already
-      # chrooted below /public_html/wp-content/uploads/firmware.
+      # STEP 2: Ensure the remote directory chain exists before uploading.
+      #
+      # Confirmed 2026-08-14 via direct FTP inspection (see issue #300):
+      #   - The FTP account root ("/") IS the web server root (public_html).
+      #   - It already contains "wp-content/uploads/firmware/CO2-Gadget/".
+      #   - REMOTE_DIR below MUST therefore repeat the full web-server path
+      #     (it is NOT chrooted to the firmware directory).
+      # SamKirkland/FTP-Deploy-Action@2.0.0 is known to silently fail to
+      # create missing nested directories, so we create the chain ourselves
+      # (idempotent — ignores "already exists" errors) before the upload.
       # ------------------------------------------------------------------
-      - name: Inspect FTP root and firmware directories
+      - name: Ensure remote FTP directory exists
         env:
           FTP_SERVER: ${{ secrets.FTP_SERVER }}
           FTP_USERNAME: ${{ secrets.FTP_USER }}
           FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
+          REPO_NAME: ${{ github.event.repository.name }}
         run: |
           python - <<'PY'
           import ftplib
@@ -265,43 +272,28 @@ jobs:
           parsed = urlparse(raw_server if "://" in raw_server else f"ftp://{raw_server}")
           host = parsed.hostname or raw_server
           port = parsed.port or 21
+
           ftp = ftplib.FTP()
-          try:
-              ftp.connect(host, port, timeout=20)
-              ftp.login(os.environ["FTP_USERNAME"], os.environ["FTP_PASSWORD"])
-              print(f"FTP server: {host}:{port}")
-              print(f"FTP PWD: {ftp.pwd()}")
-          except Exception as exc:
-              # Diagnostics must never prevent the actual deploy action.
-              print(f"FTP diagnostic connection failed: {type(exc).__name__}: {exc}")
-              raise SystemExit(0)
-
-          candidates = [
-              ".",
-              "/",
-              "/public_html",
-              "/public_html/wp-content",
-              "/public_html/wp-content/uploads",
-              "/public_html/wp-content/uploads/firmware",
-              "/wp-content",
-              "/wp-content/uploads",
-              "/wp-content/uploads/firmware",
-          ]
-          for path in candidates:
+          ftp.connect(host, port, timeout=20)
+          ftp.login(os.environ["FTP_USERNAME"], os.environ["FTP_PASSWORD"])
+
+          target = f"/wp-content/uploads/firmware/{os.environ['REPO_NAME']}/beta"
+          parts = [p for p in target.split("/") if p]
+          path = ""
+          for part in parts:
+              path += "/" + part
               try:
-                  ftp.cwd(path)
-                  names = []
-                  ftp.retrlines("NLST", names.append)
-                  print(f"FTP PATH OK: {path} -> {names[:30]}")
-              except Exception as exc:
-                  print(f"FTP PATH MISS: {path} -> {type(exc).__name__}")
+                  ftp.mkd(path)
+                  print(f"Created: {path}")
+              except ftplib.error_perm:
+                  print(f"Already exists: {path}")
 
           ftp.quit()
           PY
 
       # ------------------------------------------------------------------
       # STEP 3: Deploy .bin files to emariete.com via FTP
-      # The account is expected to be rooted at the firmware directory.
+      # REMOTE_DIR repeats the full web-server path (see note above).
       # ------------------------------------------------------------------
       - name: FTP upload firmware .bin files
         uses: SamKirkland/FTP-Deploy-Action@2.0.0
@@ -310,9 +302,7 @@ jobs:
           FTP_USERNAME: ${{ secrets.FTP_USER }}
           FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
           LOCAL_DIR: ./ftp_firmware/beta/
-          # FTP account root already maps to /wp-content/uploads/firmware/.
-          # Do not repeat the web-server path here.
-          REMOTE_DIR: /${{ github.event.repository.name }}/beta/
+          REMOTE_DIR: /wp-content/uploads/firmware/${{ github.event.repository.name }}/beta/
           METHOD: ftp
           PORT: 21
           ARGS: --verbose

CHANGELOG.md

@@ -6,13 +6,10 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ---
 
-## [Unreleased] — v0.16.024-beta (branch: development)
+## [Unreleased] — v0.16.025-beta (branch: development)
 
 ### Fixed
-- **Beta firmware deployment**: corrected the FTP destination so firmware binaries are uploaded to the same `/beta/` path referenced by the GitHub Pages manifests. (release workflow)
-- **FTP account root**: corrected the remote path to account for the FTP user's chroot at the firmware directory.
-- **FTP deployment diagnostics**: added temporary root/path inspection to the Beta workflow without exposing credentials.
-- **FTP diagnostics robustness**: normalize an optional `ftp://` prefix and never block deployment when inspection cannot connect.
+- **#300 — Beta/Release firmware deployment**: root-caused via direct FTP inspection — the FTP account root is the web server root (`public_html`), not chrooted to the firmware directory. `REMOTE_DIR` now correctly repeats the full `/wp-content/uploads/firmware/CO2-Gadget/...` path in both `release3_beta.yml` and `release3.yml`, matching the absolute URLs baked into the manifests. Added a permanent, idempotent "ensure remote directory exists" step before upload, since the FTP action used (`SamKirkland/FTP-Deploy-Action@2.0.0`) can silently fail to create missing nested directories.
 - **index page polling**: dashboard now respects device's `measurementInterval` instead of hardcoded 15s polling. Removed dead code (`setUpdateIntervals`, `updateMeasurementInterval`) with multiple bugs including double ms conversion and missing `clearInterval`. (`webserver/index.js`)
 - **savePreferences debug log**: added `WIFI_PRIVACY` guard to `/savePreferences` debug output for consistency with `printActualSettings()` and `onWifiSettingsChanged()` (`CO2_Gadget_WIFI.h:1860`)
 - **ESP-NOW peer MAC**: fixed web UI save of peer MAC address — local variable was shadowing the global, causing changes via preferences page to be silently discarded (`CO2_Gadget_Preferences.h:1108`)

README.md

@@ -23,7 +23,7 @@
 
 **CO2-Gadget** is an advanced, feature-rich firmware for ESP32-based CO₂ monitors and air quality meters. It supports a wide range of CO₂ sensors, particulate matter (PM) sensors, environmental sensors, displays (TFT, OLED, E-Ink), and communication protocols (WiFi, BLE, MQTT, ESP-NOW). Whether you're building a custom air quality monitor or flashing a commercial board, CO2-Gadget offers enterprise-grade features in a compact embedded package.
 
-> **Current version:** v0.16.024-beta — `development` branch. See [CHANGELOG.md](CHANGELOG.md) for full release history.
+> **Current version:** v0.16.025-beta — `development` branch. See [CHANGELOG.md](CHANGELOG.md) for full release history.
 
 This repository is primarily aimed at **developers and advanced users**. If you're an end user looking to install the firmware on your device, visit the [CO2 Gadget page](https://emariete.com/medidor-co2-gadget/) for pre-built binaries, one-click browser installation, and detailed guides — no compilation required.
 

platformio.ini

@@ -11,7 +11,7 @@ extra_configs = platformio_extra_configs.ini
 [version]
 build_flags =
     -D CO2_GADGET_VERSION="\"0.16."\"
-    -D CO2_GADGET_REV="\"024-beta\""
+    -D CO2_GADGET_REV="\"025-beta\""
 
 ;****************************************************************************************
 ;*** You can disable features by commenting the line with a semicolon at the beginning