!cleanup!

Author: 0ct0sec

README.md

@@ -2,7 +2,7 @@
                     Volume Zero, Issue 3, Phile 1 of 1
 
                           M5PORKCHOP README
-                          v0.1.8b-heapkampf
+                          v0.1.8b-PSTH
 
                             ^__^
                             (oo)\_______

platformio.ini

@@ -4,7 +4,7 @@
 platform = espressif32@6.12.0
 board = m5stack-stamps3
 framework = arduino
-custom_version = 0.1.8b-heapkampf
+custom_version = 0.1.8b-PSTH
 board_build.mcu = esp32s3
 board_build.f_cpu = 240000000L
 board_build.flash_mode = qio

scripts/build_release.py

@@ -6,14 +6,17 @@
 
     --[ 0x00 - What This Does
 
-        Builds both release binaries for distribution:
-        
+        Builds release binaries for distribution:
+
         1. firmware_vX.X.X.bin       - Flash at 0x10000 via esptool-js
                                        (preserves XP, for upgrades)
-        
+
         2. porkchop_vX.X.X_m5burner.bin - Flash at 0x0 via M5 Burner
                                           (full image, nukes NVS)
 
+        3. porkchop_vX.X.X_m5burner.zip - M5Burner catalog package
+                                           (m5burner.json + address-named bins)
+
         Output lands in m5porkchop_builds/ directory.
 
 
@@ -39,11 +42,13 @@
 import subprocess
 import shutil
 import re
+import json
+import zipfile
 from pathlib import Path
 
 # Phrack-style banner
 BANNER = r"""
- ██▓███   ▒█████   ██▀███   ██ ▄█▀ ▄████▄   ██░ ██  ▒█████   ██▓███  
+ ██▓███   ▒█████   ██▀███   ██ ▄█▀ ▄████▄   ██░ ██  ▒█████   ██▓███
 ▓██░  ██▒▒██▒  ██▒▓██ ▒ ██▒ ██▄█▒ ▒██▀ ▀█  ▓██░ ██▒▒██▒  ██▒▓██░  ██▒
 ▓██░ ██▓▒▒██░  ██▒▓██ ░▄█ ▒▓███▄░ ▒▓█    ▄ ▒██▀▀██░▒██░  ██▒▓██░ ██▓▒
 ▒██▄█▓▒ ▒▒██   ██░▒██▀▀█▄  ▓██ █▄ ▒▓▓▄ ▄██▒░▓█ ░██ ▒██   ██░▒██▄█▓▒ ▒
@@ -73,109 +78,169 @@ def log_info(msg):
 def get_version():
     """Extract version from platformio.ini"""
     ini_path = Path(__file__).parent.parent / "platformio.ini"
-    
+
     if not ini_path.exists():
         log_err("platformio.ini not found - are you in the right directory?")
         sys.exit(1)
-    
+
     with open(ini_path, "r") as f:
         content = f.read()
-    
-    # Look for custom_version = X.X.X or X.X.X_suffix
-    match = re.search(r'custom_version\s*=\s*([\d.]+[\w_]*)', content)
+
+    # Match version strings like 0.1.8b-PSTH, 0.1.8b_suffix, 0.1.8b
+    match = re.search(r'custom_version\s*=\s*([\w.\-]+)', content)
     if match:
         return match.group(1)
-    
+
     log_err("Could not find custom_version in platformio.ini")
     sys.exit(1)
 
 
 def run_cmd(cmd, description):
     """Run a command and handle errors"""
     log_info(f"{description}...")
-    
+
     try:
         result = subprocess.run(
             cmd,
             shell=True,
             capture_output=True,
             text=True
         )
-        
+
         if result.returncode != 0:
             log_err(f"Command failed: {cmd}")
             log_err(result.stderr)
             sys.exit(1)
-        
+
         return result.stdout
     except Exception as e:
         log_err(f"Exception running command: {e}")
         sys.exit(1)
 
 
+def create_m5burner_package(builds_dir, version, bootloader_src, partitions_src, firmware_src):
+    """Create M5Burner-compatible ZIP package with manifest and address-named bins"""
+    log_info("Creating M5Burner catalog package...")
+
+    pkg_dir = builds_dir / f"porkchop_v{version}_m5burner_pkg"
+    fw_dir = pkg_dir / "firmware"
+
+    # Clean previous package
+    if pkg_dir.exists():
+        shutil.rmtree(pkg_dir)
+    fw_dir.mkdir(parents=True)
+
+    # Copy bins with M5Burner address-naming convention
+    shutil.copy2(bootloader_src, fw_dir / "bootloader_0x0.bin")
+    shutil.copy2(partitions_src, fw_dir / "partitions_0x8000.bin")
+    shutil.copy2(firmware_src, fw_dir / "porkchop_0x10000.bin")
+
+    # Generate m5burner.json manifest
+    manifest = {
+        "name": "PORKCHOP",
+        "version": version,
+        "description": "WiFi pentesting & wardriving tool for M5Stack Cardputer",
+        "keywords": "wifi,wardriving,pentesting,handshake,spectrum,deauth",
+        "author": "0ct0",
+        "repository": "https://github.com/0ct0-porkchop/porkchop",
+        "framework": "arduino",
+        "firmware_category": {
+            "PORKCHOP": {
+                "path": "firmware",
+                "device": ["M5Cardputer"],
+                "default_baud": 921600
+            }
+        }
+    }
+
+    manifest_path = pkg_dir / "m5burner.json"
+    with open(manifest_path, "w") as f:
+        json.dump(manifest, f, indent=2)
+
+    # Create ZIP
+    zip_path = builds_dir / f"porkchop_v{version}_m5burner.zip"
+    with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as zf:
+        for file in pkg_dir.rglob("*"):
+            if file.is_file():
+                arcname = file.relative_to(pkg_dir)
+                zf.write(file, arcname)
+
+    # Cleanup staging directory
+    shutil.rmtree(pkg_dir)
+
+    size_kb = zip_path.stat().st_size / 1024
+    log_ok(f"Created: {zip_path.name} ({size_kb:.1f} KB)")
+
+    return zip_path
+
+
 def main():
     print(BANNER)
-    
+
     # Get project root (parent of scripts/)
     project_root = Path(__file__).parent.parent
     os.chdir(project_root)
-    
+
     log_info(f"Working directory: {project_root}")
-    
+
     # Get version
     version = get_version()
     log_ok(f"Building version: {version}")
-    
+
     # Create output directory
     builds_dir = project_root / "m5porkchop_builds"
     builds_dir.mkdir(exist_ok=True)
     log_ok(f"Output directory: {builds_dir}")
-    
+
     # Build paths
     build_dir = project_root / ".pio" / "build" / "m5cardputer"
     firmware_src = build_dir / "firmware.bin"
     bootloader_src = build_dir / "bootloader.bin"
     partitions_src = build_dir / "partitions.bin"
-    
+
     # Output filenames
     firmware_dst = builds_dir / f"firmware_v{version}.bin"
     m5burner_dst = builds_dir / f"porkchop_v{version}_m5burner.bin"
-    
+
     # Step 1: Build with PlatformIO
     log("")
     log("=" * 60)
     log("STEP 1: Building firmware with PlatformIO")
     log("=" * 60)
-    
+
     run_cmd("pio run -t clean -e m5cardputer", "Cleaning build artifacts")
     run_cmd("pio run -e m5cardputer", "Compiling")
     log_ok("Firmware compiled successfully")
-    
+
     # Verify build artifacts exist
     if not firmware_src.exists():
         log_err(f"firmware.bin not found at {firmware_src}")
         sys.exit(1)
-    
+
     if not bootloader_src.exists():
         log_err(f"bootloader.bin not found at {bootloader_src}")
         sys.exit(1)
-    
+
+    if not partitions_src.exists():
+        log_err(f"partitions.bin not found at {partitions_src}")
+        sys.exit(1)
+
     # Step 2: Copy firmware.bin for esptool-js upgrades
     log("")
     log("=" * 60)
     log("STEP 2: Copying firmware for esptool-js upgrades")
     log("=" * 60)
-    
+
     shutil.copy2(firmware_src, firmware_dst)
     size_kb = firmware_dst.stat().st_size / 1024
     log_ok(f"Created: {firmware_dst.name} ({size_kb:.1f} KB)")
-    
-    # Step 3: Create merged binary for M5 Burner
+
+    # Step 3: Create merged binary for M5 Burner (direct flash)
     log("")
     log("=" * 60)
     log("STEP 3: Creating merged binary for M5 Burner")
     log("=" * 60)
-    
+
     # Build the esptool merge command
     merge_cmd = (
         f'pio pkg exec -p tool-esptoolpy -- esptool.py '
@@ -186,12 +251,22 @@ def main():
         f'0x8000 "{partitions_src}" '
         f'0x10000 "{firmware_src}"'
     )
-    
+
     run_cmd(merge_cmd, "Merging binaries")
-    
+
     size_kb = m5burner_dst.stat().st_size / 1024
     log_ok(f"Created: {m5burner_dst.name} ({size_kb:.1f} KB)")
-    
+
+    # Step 4: Create M5Burner catalog package (ZIP with manifest)
+    log("")
+    log("=" * 60)
+    log("STEP 4: Creating M5Burner catalog package")
+    log("=" * 60)
+
+    zip_path = create_m5burner_package(
+        builds_dir, version, bootloader_src, partitions_src, firmware_src
+    )
+
     # Summary
     log("")
     log("=" * 60)
@@ -206,9 +281,12 @@ def main():
     log(f"    {m5burner_dst.name}")
     log(f"        -> Flash at 0x0 via M5 Burner (full install)")
     log("")
+    log(f"    {zip_path.name}")
+    log(f"        -> M5Burner catalog package (m5burner.json + bins)")
+    log("")
     log_info(f"Files are in: {builds_dir}")
     log("")
-    
+
     return 0
 
 

src/build_info.h

@@ -1,5 +1,5 @@
 // Auto-generated build info
 #pragma once
-#define BUILD_TIME "2026-02-08T01:44:20.292145"
-#define BUILD_VERSION "0.1.8b-heapkampf"
-#define BUILD_COMMIT "e4fd745"
+#define BUILD_TIME "2026-02-08T03:36:59.286318"
+#define BUILD_VERSION "0.1.8b-PSTH"
+#define BUILD_COMMIT "48a05c1"

src/core/heap_health.cpp

@@ -29,6 +29,7 @@ static uint32_t pendingToastMs = 0;
 // Graduated pressure level with hysteresis
 static HeapPressureLevel pressureLevel = HeapPressureLevel::Normal;
 static uint32_t lastPressureChangeMs = 0;
+static uint8_t escalationCount = 0;
 
 // Knuth's Rule metric: free_blocks / allocated_blocks
 static float knuthRatio = 0.0f;
@@ -132,17 +133,23 @@ void update() {
     // --- Graduated pressure level with hysteresis ---
     HeapPressureLevel newLevel = computePressureLevel(freeHeap, fragRatio);
     if (newLevel != pressureLevel) {
-        // Allow immediate escalation (getting worse), but require
-        // hysteresis delay before de-escalation (getting better)
         if (newLevel > pressureLevel) {
-            // Escalating: apply immediately
-            pressureLevel = newLevel;
-            lastPressureChangeMs = now;
+            // Escalating: require 2 consecutive samples (except Critical = immediate)
+            escalationCount++;
+            uint8_t threshold = (newLevel == HeapPressureLevel::Critical) ? 1 : 2;
+            if (escalationCount >= threshold) {
+                pressureLevel = newLevel;
+                lastPressureChangeMs = now;
+                escalationCount = 0;
+            }
         } else if ((now - lastPressureChangeMs) >= HeapPolicy::kPressureHysteresisMs) {
             // De-escalating: only after hysteresis period
             pressureLevel = newLevel;
             lastPressureChangeMs = now;
+            escalationCount = 0;
         }
+    } else {
+        escalationCount = 0;
     }
 
     // --- Adaptive conditioning trigger ---