From a55cce854edff4059cfde4682fbd232cf478a48e Mon Sep 17 00:00:00 2001
From: Manuel Weiser <manuel.weiser@me.com>
Date: Sat, 15 Feb 2025 07:14:12 +0100
Subject: [PATCH] refactor: remove combined binary creation script and related
 configurations

---
 create_combined_binary.py | 68 ---------------------------------------
 partitions.csv            |  6 ----
 platformio.ini            | 13 --------
 3 files changed, 87 deletions(-)
 delete mode 100644 create_combined_binary.py
 delete mode 100644 partitions.csv

diff --git a/create_combined_binary.py b/create_combined_binary.py
deleted file mode 100644
index 6d7d26f..0000000
--- a/create_combined_binary.py
+++ /dev/null
@@ -1,68 +0,0 @@
-Import("env")
-from os.path import join, exists
-import shutil
-import os
-
-def combine_binaries(source, target, env):
-    # Define paths for binary files
-    build_dir = env.subst("$BUILD_DIR")
-    project_dir = env.subst("$PROJECT_DIR")
-    combined_bin = join(build_dir, "combined.bin")
-    firmware_bin = join(build_dir, "firmware.bin")
-    spiffs_bin = join(build_dir, "spiffs.bin")
-    
-    # Define target firmware path
-    firmware_dir = join(project_dir, "firmware")
-    target_firmware = join(firmware_dir, "filaman.bin")
-
-    # Build firmware if it doesn't exist
-    if not exists(firmware_bin):
-        print("Building firmware...")
-        env.Execute("pio run -t buildprog")
-
-    # Build SPIFFS if it doesn't exist
-    if not exists(spiffs_bin):
-        print("Building SPIFFS image...")
-        env.Execute("pio run -t buildfs")
-
-    # Check if files exist after build attempts
-    if not exists(firmware_bin):
-        raise Exception("Firmware binary not found at: " + firmware_bin)
-    
-    if not exists(spiffs_bin):
-        raise Exception("SPIFFS binary not found at: " + spiffs_bin)
-
-    print("Found firmware at:", firmware_bin)
-    print("Found SPIFFS at:", spiffs_bin)
-
-    # Command to merge firmware and SPIFFS
-    merge_command = (
-        "esptool.py --chip esp32 merge_bin -o {combined_bin} "
-        "--flash_mode dio --flash_freq 40m --flash_size 4MB "
-        "0x10000 {firmware_bin} 0x310000 {spiffs_bin}"
-    ).format(
-        combined_bin=combined_bin,
-        firmware_bin=firmware_bin,
-        spiffs_bin=spiffs_bin
-    )
-    
-    print("Executing merge command:", merge_command)
-    env.Execute(merge_command)
-
-    # Create firmware directory if it doesn't exist
-    if not exists(firmware_dir):
-        os.makedirs(firmware_dir)
-
-    # Move combined binary to target location
-    print(f"Moving combined binary to {target_firmware}")
-    shutil.copy2(combined_bin, target_firmware)
-    print(f"Binary successfully moved to {target_firmware}")
-
-# Register the custom target with explicit dependencies
-env.AddCustomTarget(
-    name="combine_binaries",
-    dependencies=["buildfs", "buildprog"],
-    actions=[combine_binaries],
-    title="Combine Firmware & SPIFFS",
-    description="Combines firmware.bin and spiffs.bin into a single binary"
-)
\ No newline at end of file
diff --git a/partitions.csv b/partitions.csv
deleted file mode 100644
index 2aaba56..0000000
--- a/partitions.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-nvs,      data, nvs,     0x9000,  0x4000,
-otadata,  data, ota,     0xd000,  0x2000,
-app0,     app,  ota_0,   0x10000, 0x180000,
-app1,     app,  ota_1,   0x190000,0x180000,
-spiffs,   data, spiffs,  0x310000,0x0F0000,
\ No newline at end of file
diff --git a/platformio.ini b/platformio.ini
index d8d279f..e6c362b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -27,9 +27,7 @@ lib_deps =
     digitaldragon/SSLClient @ ^1.3.2
     
 ; Enable SPIFFS upload
-board_build.partitions = partitions.csv
 board_build.filesystem = spiffs
-board_upload.flash_size = 4MB
 board_build.spiffs_create = yes
 board_build.spiffs.partition = 2M
 board_build.spiffs.upload_size = 2M
@@ -44,14 +42,3 @@ build_flags =
 extra_scripts = 
     pre:gzip_files.py
     pre:extra_script.py
-    post:$PROJECT_DIR/create_combined_binary.py
-
-# Add custom target for combining binaries
-custom_targets = 
-    combine_binaries
-
-# Define the build sequence
-targets = 
-    buildfs     # Build SPIFFS image
-    buildprog   # Build firmware
-    #combine_binaries  # Combine both binaries