From 01274f5cb76fe638499902be3deabd28cd6f960b Mon Sep 17 00:00:00 2001
From: Matt Edholm <football2801@me.com>
Date: Mon, 27 Apr 2026 22:51:19 -0400
Subject: [PATCH] chore: restructure firmware into subdirectory, add DDEV
 config

Move firmware files from repo root src/ into firmware/ to avoid
collision with Symfony's src/ PHP class directory. Add DDEV
config targeting PHP 8.4 / PostgreSQL 16 / nginx-fpm with
Imagick extension via docker-compose override.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .ddev/config.yaml                             | 12 ++++++++++++
 .ddev/docker-compose.imagick.yaml             | 12 ++++++++++++
 convert_photo.py => firmware/convert_photo.py |  0
 platformio.ini => firmware/platformio.ini     |  0
 {src => firmware/src}/image.h                 |  0
 {src => firmware/src}/main.cpp                |  0
 6 files changed, 24 insertions(+)
 create mode 100644 .ddev/config.yaml
 create mode 100644 .ddev/docker-compose.imagick.yaml
 rename convert_photo.py => firmware/convert_photo.py (100%)
 rename platformio.ini => firmware/platformio.ini (100%)
 rename {src => firmware/src}/image.h (100%)
 rename {src => firmware/src}/main.cpp (100%)

diff --git a/.ddev/config.yaml b/.ddev/config.yaml
new file mode 100644
index 0000000..0375f57
--- /dev/null
+++ b/.ddev/config.yaml
@@ -0,0 +1,12 @@
+name: pictureframe
+type: symfony
+docroot: public
+php_version: "8.4"
+webserver_type: nginx-fpm
+database:
+  type: postgres
+  version: "16"
+composer_version: "2"
+hooks:
+  post-start:
+    - exec: composer install --no-interaction 2>/dev/null || true
diff --git a/.ddev/docker-compose.imagick.yaml b/.ddev/docker-compose.imagick.yaml
new file mode 100644
index 0000000..ae74499
--- /dev/null
+++ b/.ddev/docker-compose.imagick.yaml
@@ -0,0 +1,12 @@
+services:
+  web:
+    build:
+      context: .
+      dockerfile_inline: |
+        ARG BASE_IMAGE
+        FROM $BASE_IMAGE
+        RUN apt-get update && apt-get install -y \
+          libmagickwand-dev \
+          && pecl install imagick \
+          && docker-php-ext-enable imagick \
+          && rm -rf /var/lib/apt/lists/*
diff --git a/convert_photo.py b/firmware/convert_photo.py
similarity index 100%
rename from convert_photo.py
rename to firmware/convert_photo.py
diff --git a/platformio.ini b/firmware/platformio.ini
similarity index 100%
rename from platformio.ini
rename to firmware/platformio.ini
diff --git a/src/image.h b/firmware/src/image.h
similarity index 100%
rename from src/image.h
rename to firmware/src/image.h
diff --git a/src/main.cpp b/firmware/src/main.cpp
similarity index 100%
rename from src/main.cpp
rename to firmware/src/main.cpp