chore: Complete Redesign & Documentation Update

- Redesign: Unified Data Models, Global DataManager, and Remote Persistence.
- Fixes: Resolved CI/CD compilation errors and boot stability issues.
- Docs: Updated README with architecture details, screen descriptions, and cross-repo links.

Author: bert27

.gitignore

@@ -18,3 +18,6 @@ build/
 
 # Secrets
 secrets.h
+
+# Design
+*.psd

README.md

@@ -5,6 +5,7 @@
 
 🇺🇸 **[Read in English](README.md)** | 🇪🇸 **[Leer en Español](README_ES.md)**
 
+
 This project provides a base implementation for **generic 4.3-inch smart displays** (ESP32-S3 IPS 800x480) commonly found on **AliExpress** (Sunton 8048S043 models or clones).
 The project is optimized to be uploaded from both the Arduino IDE and VS Code with PlatformIO.
 
@@ -15,9 +16,14 @@ The project is optimized to be uploaded from both the Arduino IDE and VS Code wi
 - **Graphic Interface**: [LVGL v9.1.0](https://lvgl.io/).
 - **Graphics Library**: [Arduino_GFX](https://github.com/moononournation/Arduino_GFX).
 - **Anti-Flicker Stabilization**: **"Bus Isolation"** strategy (SRAM + Bounce Buffer) to eliminate flickering caused by PSRAM concurrency.
-- **Modular UI**: Component-based interface (Pages/Components) using LVGL 9.1.
-- **Persistent Configuration**: Settings (pump times) are automatically saved to flash memory (MemoryManager/NVS).
-- **ESP-NOW Communication**: Direct wireless communication with the Drinks Machine/Irrigation system. Sends drink selections via broadcast.
+- **Modular UI**: Component-based interface (Pages/Components) using LVGL 9.1 featuring **3 Main Screens**:
+    1.  **Drink Selection**: Visual gallery to browse and choose cocktails.
+    2.  **Recipe Config**: Interactive modal to adjust ingredients and quantities for each cocktail.
+    3.  **Pump Config**: Calibration and timing adjustments for the 4 peristaltic pumps.
+
+[![Main Firmware](https://img.shields.io/badge/Get_Main_Firmware-Robot_Core-blueviolet?style=flat&logo=arduino)](https://github.com/Albert-Benavent-Cabrera/Robot-Core)
+- **Remote Configuration**: Cocktails and ingredients are received via ESP-NOW from the Drinks App (Robot Core). Adjusting slider values saves the configuration on the server remotely, not locally. Displays "Mock" data if offline.
+- **ESP-NOW Communication**: Direct wireless communication with the Drinks Machine. Sends drink selections via broadcast.
 - **Smart Channel Sync**: Automatically scans for a target WiFi network to synchronize its radio channel with the receiver.
 
 <p align="center">
@@ -30,11 +36,14 @@ The project is optimized to be uploaded from both the Arduino IDE and VS Code wi
 This project is fully compatible with the Arduino IDE. Follow these steps to set it up:
 
 ### 1. 📚 Library Preparation
-Install the following **3 libraries** from the Arduino **Library Manager** (**Tools > Manage Libraries**):
+**NOTE:** The `Arduino_GFX` library is included in the `lib/` folder of this project. **Do not** install it from the Manager.
+
+Install only these **2 libraries** from the Arduino **Library Manager** (**Tools > Manage Libraries**):
 
 1. **lvgl** (v9.1.0) - Graphics engine.
-2. **Arduino_GFX_Library** - Display driver.
-3. **GT911** - Touch panel driver.
+2. **GT911** - Touch panel driver.
+
+Additionally, you must **manually copy** the `lib/GFX_Library_for_Arduino` folder to your Arduino libraries folder (`Documents/Arduino/libraries/`) to use this project with the official IDE.
 
 > [!IMPORTANT]
 > If you receive `No such file or directory` errors with any of these names, it is because the corresponding library is missing from the Arduino manager.

README_ES.md

@@ -5,6 +5,7 @@
 
 🇺🇸 **[Read in English](README.md)** | 🇪🇸 **[Leer en Español](README_ES.md)**
 
+
 Este proyecto proporciona una implementación base para las **pantallas inteligentes genéricas de 4.3 pulgadas** (ESP32-S3 IPS 800x480) que se encuentran fácilmente en **AliExpress** (modelos tipo Sunton 8048S043 o clones).
  El proyecto está optimizado para ser cargado tanto desde el IDE de Arduino como desde VS Code con PlatformIO.
 
@@ -15,9 +16,14 @@ Este proyecto proporciona una implementación base para las **pantallas intelige
 - **Interfaz Gráfica**: [LVGL v9.1.0](https://lvgl.io/).
 - **Librería de Gráficos**: [Arduino_GFX](https://github.com/moononournation/Arduino_GFX).
 - **Estabilización Anti-Flicker**: Estrategia de **"Aislamiento de Bus"** (SRAM + Bounce Buffer) para eliminar parpadeos por concurrencia en PSRAM.
-- **UI Modular**: Interfaz basada en componentes (Pages/Components) con LVGL 9.1.
-- **Configuración Persistente**: Los ajustes (tiempos de bomba) se guardan automáticamente en memoria flash (MemoryManager/NVS).
-- **Comunicación ESP-NOW**: Comunicación inalámbrica directa con la Máquina de Bebidas/Sistema de Riego. Envía selecciones de bebidas por broadcast.
+- **UI Modular**: Interfaz basada en componentes (Pages/Components) con LVGL 9.1 que consta de **3 Pantallas Principales**:
+    1.  **Selección de Bebidas**: Galería visual para ver y elegir cócteles.
+    2.  **Configuración de Recetas**: Modal interactivo para ajustar ingredientes y cantidades de cada cóctel.
+    3.  **Configuración de Bombas**: Ajuste de calibración y tiempos de las 4 bombas peristálticas.
+
+[![Firmware Principal](https://img.shields.io/badge/Descargar_Firmware_Principal-Robot_Core-blueviolet?style=flat&logo=arduino)](https://github.com/Albert-Benavent-Cabrera/Robot-Core)
+- **Configuración Remota**: La pantalla recibe cócteles e ingredientes vía ESP-NOW desde la App Drinks (Robot Core). Al modificar valores en los sliders, la configuración se guarda en el servidor de forma remota, no localmente. Muestra datos "Mock" si no hay conexión estable.
+- **Comunicación ESP-NOW**: Comunicación inalámbrica directa con la Máquina de Bebidas. Envía selecciones de bebidas por broadcast.
 - **Sincronización Inteligente de Canal**: Escanea automáticamente la red WiFi objetivo para sintonizar su canal de radio con el receptor.
 
 <p align="center">
@@ -30,11 +36,14 @@ Este proyecto proporciona una implementación base para las **pantallas intelige
 Este proyecto es totalmente compatible con el IDE de Arduino. Sigue estos pasos para configurarlo:
 
 ### 1. 📚 Preparación de Librerías
-Instala las siguientes **3 librerías** desde el **Gestor de Librerías** de Arduino (**Herramientas > Gestionar librerías**):
+**NOTA:** La librería `Arduino_GFX` está incluida en la carpeta `lib/` de este proyecto. **No** la instales desde el gestor.
+
+Instala solo estas **2 librerías** desde el **Gestor de Librerías** de Arduino (**Herramientas > Gestionar librerías**):
 
 1. **lvgl** (v9.1.0) - Motor de gráficos.
-2. **Arduino_GFX_Library** - Driver de la pantalla.
-3. **GT911** - Driver del panel táctil.
+2. **GT911** - Driver del panel táctil.
+
+Además, debes **copiar manualmemte** la carpeta `lib/GFX_Library_for_Arduino` a tu carpeta de librerías de Arduino (`Documents/Arduino/libraries/`) para usar este proyecto con el IDE oficial.
 
 > [!IMPORTANT]
 > Si recibes errores tipo `No such file or directory` con cualquiera de estos nombres, es porque falta la librería correspondiente en el gestor de Arduino.

display/display.ino

@@ -1,7 +1,7 @@
 
 
 #include "src/core/DisplayManager.hpp"
-#include "src/core/MemoryManager.hpp"
+
 
 void setup() {
     // Initialize serial port
@@ -18,8 +18,7 @@ void setup() {
     Serial.println("######################################\n");
     Serial.flush();
 
-    // Initialize NVS (Preferences)
-    MemoryManager::begin();
+
 
     // Get manager instance and start
     if (!DisplayManager::getInstance().begin()) {

display/src/core/Config.hpp

@@ -101,4 +101,35 @@
   #define TOUCH_MAP_Y2 220 // Adjusted margin (Raw ~224 -> 480)
 #endif
 
+
+// --- Application Defaults (Mocks) ---
+#define SYNC_RETRY_INTERVAL_MS 5000
+
+#include <vector>
+#include "models.hpp"
+
+inline std::vector<ICocktail> getDefaultMockCocktails() {
+    return {
+        {"Cocacola", nullptr, 0xFF0000, {{"Cocacola", 1, 200}}},
+        {"Orange Juice", nullptr, 0xFFA500, {{"Orange", 2, 200}}},
+        {"Vodka shot", nullptr, 0x00FFFF, {{"Vodka", 3, 50}}},
+        {"Vodka Coke", nullptr, 0x8B0000, {{"Vodka", 3, 50}, {"Cocacola", 1, 150}}},
+        {"Screwdriver", nullptr, 0xFFD700, {{"Vodka", 3, 50}, {"Orange", 2, 150}}},
+        {"Sex on Beach", nullptr, 0xFF1493, {{"Vodka", 3, 40}, {"Orange", 2, 100}, {"Grenadine", 4, 10}}},
+        {"Tequila Sun", nullptr, 0xFF4500, {{"Tequila", 3, 50}, {"Orange", 2, 120}, {"Grenadine", 4, 10}}},
+        {"Shirley T.", nullptr, 0xFF69B4, {{"Orange", 2, 100}, {"Grenadine", 4, 20}, {"Cocacola", 1, 50}}}
+    };
+}
+
+inline IPumpSettings getDefaultPumpSettings() {
+    IPumpSettings s;
+    for(int i=0; i<4; i++) {
+        s.pwm[i] = 255;
+        s.timeMs[i] = 1600;
+    }
+    s.synced = false;
+    return s;
+}
+
 #endif // CONFIG_HPP
+

display/src/core/DataManager.hpp

@@ -0,0 +1,139 @@
+#ifndef DATA_MANAGER_HPP
+#define DATA_MANAGER_HPP
+
+#include <Arduino.h>
+#include <vector>
+#include "remote_protocol.hpp"
+#include "models.hpp"
+#include "Config.hpp"
+#include "../ui/assets/icons.h"
+
+class DataManager {
+public:
+    static DataManager& getInstance() {
+        static DataManager instance;
+        return instance;
+    }
+
+    // --- Recipes ---
+    bool isRecipesSynced() const { return recipesSynced; }
+    bool isUsingMocks() const { return usingMocks; }
+    const std::vector<ICocktail>& getRecipes() const { return recipes; }
+    
+    void clearRecipes() { 
+        recipes.clear(); 
+        recipesSynced = false;
+        usingMocks = false;
+    }
+
+    void addRecipe(const RecipeSyncData& data) {
+        // Clear if new sync session starts (Index 0) OR if we were using mocks
+        if (data.index == 0 || usingMocks) {
+            if (usingMocks) printf("[DataManager] Real data received. Clearing Mocks.\n");
+            else printf("[DataManager] New Sync Session (Index 0). Clearing old data.\n");
+            
+            recipes.clear();
+            recipesSynced = false;
+            usingMocks = false;
+        }
+
+        if (!recipesSynced) {
+            recipesSynced = true; // Mark as syncing started
+        }
+
+        ICocktail c;
+        c.name = String(data.name);
+        mapMetadata(c);
+
+        static const char* PUMP_NAMES[] = {"Cocacola", "Orange Juice", "Vodka", "Grenadine"};
+        for (int i=0; i<4; i++) {
+             if (data.ingredientsMl[i] > 0) {
+                 c.ingredients.push_back({PUMP_NAMES[i], i+1, (int)data.ingredientsMl[i]});
+             }
+        }
+        
+        recipes.push_back(c);
+        lastUpdateTime = millis();
+    }
+
+    void addRecipeFromConfig(const ICocktail& cocktail) {
+        if (usingMocks) {
+            recipes.clear(); 
+            usingMocks = false;
+        }
+        if (!recipesSynced) {
+            recipes.clear();
+            recipesSynced = true;
+        }
+        ICocktail c = cocktail;
+        mapMetadata(c); 
+        recipes.push_back(c);
+        lastUpdateTime = millis();
+    }
+
+    void updateRecipe(const ICocktail& updatedCocktail) {
+        for (auto& c : recipes) {
+            if (c.name == updatedCocktail.name) {
+                c.ingredients = updatedCocktail.ingredients;
+                lastUpdateTime = millis();
+                printf("[DataManager] Optimistic Update for: %s\n", c.name.c_str());
+                return;
+            }
+        }
+        printf("[DataManager] Warning: Recipe not found for update: %s\n", updatedCocktail.name.c_str());
+    }
+
+    void loadMocks() {
+        if (recipesSynced && !recipes.empty() && !usingMocks) return; // Don't overwrite REAL live data
+        
+        printf("[DataManager] Loading Mocks.\n");
+        auto mocks = getDefaultMockCocktails();
+        recipes.clear();
+        for (const auto& m : mocks) {
+            ICocktail c = m;
+            mapMetadata(c);
+            recipes.push_back(c);
+        }
+        recipesSynced = true; 
+        usingMocks = true;    // Mark as Mocks
+        lastUpdateTime = millis();
+    }
+
+
+    // --- Pumps ---
+    const IPumpSettings& getPumpSettings() const { return pumps; }
+    
+    void updatePumps(const PumpSyncData& data) {
+        for(int i=0; i<4; i++) {
+            pumps.pwm[i] = data.pwm[i];
+            pumps.timeMs[i] = (int)(data.calibration[i] * 1000.0f);
+        }
+        pumps.synced = true;
+        lastUpdateTime = millis();
+    }
+
+    unsigned long getLastUpdate() const { return lastUpdateTime; }
+
+private:
+    DataManager() {}
+
+    void mapMetadata(ICocktail& c) {
+        // Centralized logic for icon/color assignment
+        if (c.name.indexOf("Coca") >= 0) { c.icon = ICON_COCKTAIL_COCA_COLA; c.color = 0xFF0000; }
+        else if (c.name.indexOf("Orange") >= 0) { c.icon = ICON_COCKTAIL_GIN_TONIC; c.color = 0xFFA500; }
+        else if (c.name.indexOf("Vodka") >= 0) { c.icon = ICON_COCKTAIL_VODKA; c.color = 0x00FFFF; }
+        else if (c.name.indexOf("Sex") >= 0) { c.icon = ICON_COCKTAIL_SEX_ON_BEACH; c.color = 0xFF1493; }
+        else if (c.name.indexOf("Tequila") >= 0) { c.icon = ICON_COCKTAIL_PORN_STAR; c.color = 0xFF4500; }
+        else if (c.name.indexOf("Gin") >= 0) { c.icon = ICON_COCKTAIL_GIN_TONIC; c.color = 0xADD8E6; }
+        else { c.icon = ICON_COCKTAIL_VODKA; c.color = 0x888888; }
+    }
+    
+    std::vector<ICocktail> recipes;
+    bool recipesSynced = false;
+    bool usingMocks = false;
+    
+    IPumpSettings pumps = getDefaultPumpSettings();
+    unsigned long lastUpdateTime = 0;
+};
+
+#endif // DATA_MANAGER_HPP

display/src/core/DisplayManager.hpp

@@ -94,12 +94,14 @@ class DisplayManager {
         lv_indev_set_type(indev, LV_INDEV_TYPE_POINTER);
         lv_indev_set_read_cb(indev, touchpad_read_cb);
 
+        printf("Initializing ESP-NOW Manager...\n");
+        if (!ESPNowManager::getInstance().begin()) {
+            printf("WARNING: ESP-NOW Init failed. Running in Offline/Mock mode.\n");
+        }
+
         printf("Initializing UI...\n");
         ui_init();
 
-        printf("Initializing ESP-NOW Manager...\n");
-        ESPNowManager::getInstance().begin();
-
         printf("System ready\n");
         return true;
     }