Add cups unit option for kcal/cup measurements

Features:
- Add cups as a unit option that only works with kcal/cup energy measurements
- Cups button is disabled with tooltip when kcal/cup is not selected
- Auto-select cups when user selects kcal/cup as energy unit
- Auto-switch to appropriate units when changing energy measurement types
- Calculate cup amounts directly from calories without density assumptions

Fixes:
- Ensure cups display correct values immediately upon auto-selection
- Fix "Per day" radio button to be pre-selected when feeding config becomes visible
- Handle empty unit values with failsafe fallback to active button

Technical details:
- Direct calorie-to-cups conversion bypassing gram conversions
- Pre-calculate cups values in food breakdown for efficient display
- Set unit before updating calculations to avoid timing issues
- Added CSS styling for disabled button state across all themes

iframe.html

@@ -447,14 +447,116 @@
             }
         }
 
+        /* Feeding Configuration Styles */
+        .dog-calculator-container .dog-calculator-feeding-config {
+            margin-top: 20px;
+            padding: 16px;
+            background: var(--bg-tertiary);
+            border: 1px solid var(--border-color);
+            border-radius: 8px;
+        }
+
+        .dog-calculator-container .dog-calculator-frequency-row {
+            display: flex;
+            align-items: center;
+            gap: 16px;
+            flex-wrap: wrap;
+        }
+
+        .dog-calculator-container .dog-calculator-frequency-row > label {
+            font-weight: 500;
+            color: var(--text-label);
+            margin: 0;
+        }
+
+        .dog-calculator-container .dog-calculator-radio-group {
+            display: flex;
+            gap: 20px;
+            align-items: center;
+        }
+
+        .dog-calculator-container .dog-calculator-radio-group label {
+            display: flex;
+            align-items: center;
+            gap: 6px;
+            cursor: pointer;
+            color: var(--text-primary);
+            font-size: 0.95rem;
+        }
+
+        .dog-calculator-container .dog-calculator-radio-group input[type="radio"] {
+            cursor: pointer;
+            margin: 0;
+        }
+
+        .dog-calculator-container .dog-calculator-radio-group input[type="radio"]:checked + span {
+            font-weight: 600;
+            color: var(--accent-color);
+        }
+
+        .dog-calculator-container .dog-calculator-meal-input {
+            display: inline-flex;
+            align-items: center;
+            gap: 6px;
+            margin: 0 auto;
+        }
+
+        .dog-calculator-container .dog-calculator-meal-input span {
+            color: var(--text-secondary);
+            font-size: 0.95rem;
+        }
+
+        .dog-calculator-container .dog-calculator-meal-input input[type="number"] {
+            width: 50px;
+            padding: 4px 8px;
+            border: 1px solid var(--border-color);
+            border-radius: 4px;
+            font-size: 0.95rem;
+            color: var(--text-primary);
+            background: var(--bg-secondary);
+            text-align: center;
+        }
+
+        .dog-calculator-container .dog-calculator-meal-input input[type="number"]:focus {
+            outline: none;
+            border-color: var(--accent-color);
+            box-shadow: 0 0 0 2px rgba(241, 154, 95, 0.1);
+        }
+
+        /* Update meal note styling */
+        .dog-calculator-container #mealNote {
+            color: var(--text-secondary);
+            font-size: 0.9rem;
+            font-weight: normal;
+            margin-left: 4px;
+        }
+
+        /* Mobile responsive adjustments for feeding config */
+        @media (max-width: 480px) {
+            .dog-calculator-meal-input {
+                margin-left: 0;
+                width: 100%;
+                margin-top: 8px;
+            }
+            
+            .dog-calculator-frequency-row {
+                flex-direction: column;
+                align-items: flex-start;
+            }
+        }
+
         /* Dark theme - manual override */
 
 .dog-calculator-container.theme-dark {
             --bg-primary: #24202d;
             --bg-secondary: #312b3b;
+            --bg-tertiary: #1f1b26;
             --border-color: #433c4f;
             --text-primary: #f5f3f7;
             --text-secondary: #b8b0c2;
+            --text-label: #9f94ae;
+            --success-color: #7fa464;
+            --error-color: #e87159;
             color: var(--text-primary);
         }
             
@@ -557,6 +659,19 @@
             background: #f19a5f;
             color: white;
         }
+
+        .dog-calculator-container.theme-dark .dog-calculator-unit-btn:disabled {
+            opacity: 0.5;
+            cursor: not-allowed;
+            border-color: var(--border-color);
+            background: var(--bg-tertiary);
+            color: var(--text-secondary);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-unit-btn:disabled:hover {
+            border-color: var(--border-color);
+            background: var(--bg-tertiary);
+        }
             
         .dog-calculator-container.theme-dark .dog-calculator-results {
             background: linear-gradient(135deg, rgba(241, 154, 95, 0.15) 0%, rgba(241, 154, 95, 0.08) 100%);
@@ -599,14 +714,55 @@
             color: var(--success-color);
         }
 
+        /* Dark theme feeding configuration styles */
+        .dog-calculator-container.theme-dark .dog-calculator-feeding-config {
+            background: var(--bg-tertiary);
+            border-color: var(--border-color);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-frequency-row > label {
+            color: var(--text-label);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-radio-group label {
+            color: var(--text-primary);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-radio-group input[type="radio"]:checked + span {
+            color: #f19a5f;
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-meal-input span {
+            color: var(--text-secondary);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-meal-input input[type="number"] {
+            background: var(--bg-secondary);
+            border-color: var(--border-color);
+            color: var(--text-primary);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-meal-input input[type="number"]:focus {
+            border-color: #f19a5f;
+            box-shadow: 0 0 0 2px rgba(241, 154, 95, 0.15);
+        }
+
+        .dog-calculator-container.theme-dark #mealNote {
+            color: var(--text-secondary);
+        }
+
         /* System theme - follows user's OS preference */
         @media (prefers-color-scheme: dark) {
             .dog-calculator-container.theme-system {
                 --bg-primary: #24202d;
                 --bg-secondary: #312b3b;
+                --bg-tertiary: #1f1b26;
                 --border-color: #433c4f;
                 --text-primary: #f5f3f7;
                 --text-secondary: #b8b0c2;
+                --text-label: #9f94ae;
+                --success-color: #7fa464;
+                --error-color: #e87159;
                 color: var(--text-primary);
             }
             
@@ -709,6 +865,19 @@
                 background: #f19a5f;
                 color: white;
             }
+
+            .dog-calculator-container.theme-system .dog-calculator-unit-btn:disabled {
+                opacity: 0.5;
+                cursor: not-allowed;
+                border-color: var(--border-color);
+                background: var(--bg-tertiary);
+                color: var(--text-secondary);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-unit-btn:disabled:hover {
+                border-color: var(--border-color);
+                background: var(--bg-tertiary);
+            }
             
             .dog-calculator-container.theme-system .dog-calculator-results {
                 background: linear-gradient(135deg, rgba(241, 154, 95, 0.15) 0%, rgba(241, 154, 95, 0.08) 100%);
@@ -750,6 +919,43 @@
                 border-color: var(--success-color);
                 color: var(--success-color);
             }
+
+            /* System theme feeding configuration styles in dark mode */
+            .dog-calculator-container.theme-system .dog-calculator-feeding-config {
+                background: var(--bg-tertiary);
+                border-color: var(--border-color);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-frequency-row > label {
+                color: var(--text-label);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-radio-group label {
+                color: var(--text-primary);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-radio-group input[type="radio"]:checked + span {
+                color: #f19a5f;
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-meal-input span {
+                color: var(--text-secondary);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-meal-input input[type="number"] {
+                background: var(--bg-secondary);
+                border-color: var(--border-color);
+                color: var(--text-primary);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-meal-input input[type="number"]:focus {
+                border-color: #f19a5f;
+                box-shadow: 0 0 0 2px rgba(241, 154, 95, 0.15);
+            }
+
+            .dog-calculator-container.theme-system #mealNote {
+                color: var(--text-secondary);
+            }
         }
 
         /* Modal Styles */
@@ -1659,6 +1865,20 @@
             color: white;
         }
 
+        .dog-calculator-unit-btn:disabled {
+            opacity: 0.5;
+            cursor: not-allowed;
+            border-color: var(--border-color);
+            background: var(--bg-tertiary);
+            color: var(--text-secondary);
+        }
+
+        .dog-calculator-unit-btn:disabled:hover {
+            border-color: var(--border-color);
+            background: var(--bg-tertiary);
+            transform: none;
+        }
+
         /* Hidden unit select for compatibility */
         .dog-calculator-unit-select-hidden {
             display: none;
@@ -1901,6 +2121,28 @@
                         <span>Add another food source</span>
                     </button>
 
+                    <!-- Feeding Configuration -->
+                    <div class="dog-calculator-feeding-config" id="feedingConfig" style="display: none;">
+                        <div class="dog-calculator-frequency-row">
+                            <label>Show amounts:</label>
+                            <div class="dog-calculator-radio-group">
+                                <label>
+                                    <input type="radio" name="showAs" value="daily" id="showDaily" checked>
+                                    <span>Per day</span>
+                                </label>
+                                <label>
+                                    <input type="radio" name="showAs" value="meal" id="showPerMeal">
+                                    <span>Per meal</span>
+                                </label>
+                            </div>
+                            <div class="dog-calculator-meal-input" id="mealInputGroup" style="display: none;">
+                                <span>×</span>
+                                <input type="number" id="mealsPerDay" value="2" min="1" max="10">
+                                <span>meals/day</span>
+                            </div>
+                        </div>
+                    </div>
+
                     <!-- Per-Food Results -->
                     <div class="dog-calculator-food-results" id="foodBreakdownResults" style="display: none;">
                         <div id="foodBreakdownList">
@@ -1914,6 +2156,7 @@
                         <button type="button" class="dog-calculator-unit-btn" data-unit="kg">kg</button>
                         <button type="button" class="dog-calculator-unit-btn" data-unit="oz">oz</button>
                         <button type="button" class="dog-calculator-unit-btn" data-unit="lb">lb</button>
+                        <button type="button" class="dog-calculator-unit-btn" data-unit="cups" id="cupsButton" disabled title="Available when using kcal/cup measurement">cups</button>
                     </div>
 
                     <!-- Daily Total Results -->
@@ -1930,13 +2173,14 @@
                         <option value="kg">kilograms (kg)</option>
                         <option value="oz">ounces (oz)</option>
                         <option value="lb">pounds (lb)</option>
+                        <option value="cups">cups</option>
                     </select>
 
                     <div class="dog-calculator-food-amounts-section" id="foodAmountsSection" style="display: none;">
                         <h4 class="dog-calculator-section-title">
                             Calculate amounts for 
                             <input type="number" id="days" min="1" step="1" value="1" placeholder="1" aria-describedby="daysHelp" class="dog-calculator-inline-days"> 
-                            <span id="dayLabel">day</span>:
+                            <span id="dayLabel">day</span><span id="mealNote" style="display: none;"></span>:
                         </h4>
                         <div id="daysError" class="dog-calculator-error dog-calculator-hidden">Please enter a valid number of days (minimum 1)</div>
                         <div id="foodAmountsList" class="dog-calculator-food-amounts-list">
@@ -2049,6 +2293,8 @@ const CALCULATOR_CONFIG = {
                 this.scale = this.getScaleFromURL() || CALCULATOR_CONFIG.defaultScale;
                 this.foodSources = [];
                 this.maxFoodSources = CALCULATOR_CONFIG.maxFoodSources;
+                this.mealsPerDay = 2;
+                this.showPerMeal = false;
                 this.init();
             }
 
@@ -2625,7 +2871,36 @@ const CALCULATOR_CONFIG = {
                 if (energyInput) {
                     energyInput.addEventListener('input', () => {
                         this.updateFoodSourceData(id, 'energy', energyInput.value);
-                        this.updateFoodCalculations();
+                        
+                        // Auto-select cups when entering energy for kcal/cup
+                        const foodSource = this.foodSources.find(fs => fs.id === id);
+                        if (foodSource && foodSource.energyUnit === 'kcalcup' && parseFloat(energyInput.value) > 0) {
+                            const unitSelect = document.getElementById('unit');
+                            const cupsButton = document.getElementById('cupsButton');
+                            
+                            // First check if cups button will be enabled after update
+                            const willEnableCups = this.foodSources.some(fs => 
+                                fs.energyUnit === 'kcalcup' && fs.energy && parseFloat(fs.energy) > 0
+                            );
+                            
+                            if (willEnableCups && unitSelect) {
+                                // Set cups BEFORE updating calculations
+                                unitSelect.value = 'cups';
+                                unitSelect.setAttribute('value', 'cups');
+                                this.setActiveUnitButton('cups');
+                                
+                                // Enable the cups button manually since we know it will be valid
+                                if (cupsButton) {
+                                    cupsButton.disabled = false;
+                                    cupsButton.title = 'Show amounts in cups';
+                                }
+                            }
+                            
+                            // Now update calculations with cups already selected
+                            this.updateFoodCalculations();
+                        } else {
+                            this.updateFoodCalculations();
+                        }
                     });
                     energyInput.addEventListener('blur', () => this.validateFoodSourceEnergy(id));
                 }
@@ -2633,7 +2908,54 @@ const CALCULATOR_CONFIG = {
                 if (energyUnitSelect) {
                     energyUnitSelect.addEventListener('change', () => {
                         this.updateFoodSourceData(id, 'energyUnit', energyUnitSelect.value);
-                        this.updateFoodCalculations();
+                        
+                        // Auto-select the most appropriate unit based on energy unit
+                        const unitSelect = document.getElementById('unit');
+                        const energyInput = document.getElementById(`energy-${id}`);
+                        
+                        if (unitSelect) {
+                            switch(energyUnitSelect.value) {
+                                case 'kcalcup':
+                                    // Check if we have energy value to enable cups
+                                    const foodSource = this.foodSources.find(fs => fs.id === id);
+                                    if (foodSource && foodSource.energy && parseFloat(foodSource.energy) > 0) {
+                                        // Set cups BEFORE updating calculations
+                                        unitSelect.value = 'cups';
+                                        unitSelect.setAttribute('value', 'cups');
+                                        this.setActiveUnitButton('cups');
+                                        
+                                        // Enable the cups button manually
+                                        const cupsButton = document.getElementById('cupsButton');
+                                        if (cupsButton) {
+                                            cupsButton.disabled = false;
+                                            cupsButton.title = 'Show amounts in cups';
+                                        }
+                                    }
+                                    this.updateFoodCalculations();
+                                    break;
+                                case 'kcal100g':
+                                    // For kcal/100g, select grams
+                                    unitSelect.value = 'g';
+                                    this.setActiveUnitButton('g');
+                                    this.updateFoodCalculations();
+                                    break;
+                                case 'kcalkg':
+                                    // For kcal/kg, also select grams (or could be kg)
+                                    unitSelect.value = 'g';
+                                    this.setActiveUnitButton('g');
+                                    this.updateFoodCalculations();
+                                    break;
+                                case 'kcalcan':
+                                    // For kcal/can, use grams as default (or ounces in imperial)
+                                    unitSelect.value = this.isImperial ? 'oz' : 'g';
+                                    this.setActiveUnitButton(unitSelect.value);
+                                    this.updateFoodCalculations();
+                                    break;
+                            }
+                        } else {
+                            // No unit select, just update calculations
+                            this.updateFoodCalculations();
+                        }
                     });
                 }
 
@@ -2803,6 +3125,58 @@ const CALCULATOR_CONFIG = {
 
                 if (addFoodBtn) addFoodBtn.addEventListener('click', () => this.addFoodSource());
 
+                // Feeding configuration event listeners
+                const showDaily = document.getElementById('showDaily');
+                const showPerMeal = document.getElementById('showPerMeal');
+                const mealsPerDayInput = document.getElementById('mealsPerDay');
+                const mealInputGroup = document.getElementById('mealInputGroup');
+
+                if (showDaily) {
+                    showDaily.addEventListener('change', () => {
+                        if (showDaily.checked) {
+                            this.showPerMeal = false;
+                            if (mealInputGroup) mealInputGroup.style.display = 'none';
+                            this.updateDayLabel();
+                            this.updateFoodCalculations();
+                        }
+                    });
+                }
+
+                if (showPerMeal) {
+                    showPerMeal.addEventListener('change', () => {
+                        if (showPerMeal.checked) {
+                            this.showPerMeal = true;
+                            if (mealInputGroup) mealInputGroup.style.display = 'inline-flex';
+                            this.updateDayLabel();
+                            this.updateFoodCalculations();
+                        }
+                    });
+                }
+
+                if (mealsPerDayInput) {
+                    mealsPerDayInput.addEventListener('input', () => {
+                        const meals = parseInt(mealsPerDayInput.value);
+                        if (meals && meals >= 1 && meals <= 10) {
+                            this.mealsPerDay = meals;
+                            if (this.showPerMeal) {
+                                this.updateDayLabel();
+                                this.updateFoodCalculations();
+                            }
+                        }
+                    });
+
+                    mealsPerDayInput.addEventListener('blur', () => {
+                        if (!mealsPerDayInput.value || parseInt(mealsPerDayInput.value) < 1) {
+                            mealsPerDayInput.value = 2;
+                            this.mealsPerDay = 2;
+                            if (this.showPerMeal) {
+                                this.updateDayLabel();
+                                this.updateFoodCalculations();
+                            }
+                        }
+                    });
+                }
+
                 // Modal event listeners
                 const shareBtn = document.getElementById('shareBtn');
                 const embedBtn = document.getElementById('embedBtn');
@@ -2979,7 +3353,7 @@ const CALCULATOR_CONFIG = {
                 }
             }
 
-            convertUnits(grams, unit) {
+            convertUnits(grams, unit, foodSource = null) {
                 switch (unit) {
                     case 'kg':
                         return grams / 1000;
@@ -2987,6 +3361,18 @@ const CALCULATOR_CONFIG = {
                         return grams / 28.3495;
                     case 'lb':
                         return grams / 453.592;
+                    case 'cups':
+                        // For cups, we need to convert from grams worth of calories to cups
+                        if (foodSource && foodSource.energyUnit === 'kcalcup' && foodSource.energy) {
+                            // Get calories per 100g for this food
+                            const caloriesPerGram = this.getFoodSourceEnergyPer100g(foodSource) / 100;
+                            // Calculate total calories represented by these grams
+                            const totalCalories = grams * caloriesPerGram;
+                            // Divide by calories per cup to get number of cups
+                            const caloriesPerCup = parseFloat(foodSource.energy);
+                            return totalCalories / caloriesPerCup;
+                        }
+                        return null; // Cannot convert to cups without kcal/cup
                     default:
                         return grams;
                 }
@@ -3021,10 +3407,21 @@ const CALCULATOR_CONFIG = {
             updateDayLabel() {
                 const days = document.getElementById('days')?.value;
                 const dayLabel = document.getElementById('dayLabel');
+                const mealNote = document.getElementById('mealNote');
                 if (dayLabel && days) {
                     const numDays = parseInt(days);
                     dayLabel.textContent = numDays === 1 ? 'day' : 'days';
                 }
+                if (mealNote) {
+                    if (this.showPerMeal && days) {
+                        const numDays = parseInt(days);
+                        const totalMeals = numDays * this.mealsPerDay;
+                        mealNote.textContent = ` (${totalMeals} meal${totalMeals === 1 ? '' : 's'} total)`;
+                        mealNote.style.display = 'inline';
+                    } else {
+                        mealNote.style.display = 'none';
+                    }
+                }
             }
 
             setActiveUnitButton(unit) {
@@ -3079,6 +3476,31 @@ const CALCULATOR_CONFIG = {
                 this.sendHeightToParent();
             }
 
+            updateCupsButtonState() {
+                const cupsButton = document.getElementById('cupsButton');
+                if (!cupsButton) return;
+                
+                // Check if any food source has kcal/cup selected
+                const hasKcalCup = this.foodSources.some(fs => 
+                    fs.energyUnit === 'kcalcup' && fs.energy && parseFloat(fs.energy) > 0
+                );
+                
+                if (hasKcalCup) {
+                    cupsButton.disabled = false;
+                    cupsButton.title = 'Show amounts in cups';
+                } else {
+                    cupsButton.disabled = true;
+                    cupsButton.title = 'Available when using kcal/cup measurement';
+                    
+                    // If cups was selected, switch back to grams
+                    const unitSelect = document.getElementById('unit');
+                    if (unitSelect && unitSelect.value === 'cups') {
+                        unitSelect.value = 'g';
+                        this.setActiveUnitButton('g');
+                    }
+                }
+            }
+
             updateFoodCalculations() {
                 if (this.currentMER === 0) return;
                 
@@ -3091,15 +3513,36 @@ const CALCULATOR_CONFIG = {
                 const totalAmountDisplay = document.getElementById('totalAmountDisplay');
                 const foodBreakdownResults = document.getElementById('foodBreakdownResults');
                 const foodBreakdownList = document.getElementById('foodBreakdownList');
+                const feedingConfig = document.getElementById('feedingConfig');
+                
+                // Update cups button state
+                this.updateCupsButtonState();
 
                 if (!daysInput || !unitSelect || !dailyFoodResults || !dailyFoodValue || !foodAmountsSection) {
                     return;
                 }
 
                 const days = daysInput.value;
-                const unit = unitSelect.value;
+                let unit = unitSelect.value;
-                const unitLabel = unit === 'g' ? 'g' : unit === 'kg' ? 'kg' : unit === 'oz' ? 'oz' : 'lb';
+                
-                const decimals = unit === 'g' ? 0 : unit === 'kg' ? 2 : 1;
+                // Failsafe: if unit is empty string but cups button is active, use 'cups'
+                if (!unit || unit === '') {
+                    const activeButton = document.querySelector('.dog-calculator-unit-btn.active');
+                    if (activeButton) {
+                        unit = activeButton.dataset.unit || 'g';
+                    } else {
+                        unit = 'g'; // Default fallback
+                    }
+                }
+                
+                const unitLabel = unit === 'g' ? 'g' : unit === 'kg' ? 'kg' : unit === 'oz' ? 'oz' : unit === 'lb' ? 'lb' : 'cups';
+                const decimals = unit === 'g' ? 0 : unit === 'kg' ? 2 : unit === 'cups' ? 1 : 1;
+                
+                // Debug: log what unit is being used
+                console.log('UpdateFoodCalculations - unit:', unit, 'unitLabel:', unitLabel);
+                
+                // Determine frequency suffix for display
+                const frequencySuffix = this.showPerMeal ? '/meal' : '/day';
                 
                 // Clear all food source errors first
                 this.foodSources.forEach(fs => {
@@ -3113,6 +3556,7 @@ const CALCULATOR_CONFIG = {
                     foodAmountsSection.style.display = 'none';
                     dailyFoodResults.style.display = 'none';
                     if (foodBreakdownResults) foodBreakdownResults.style.display = 'none';
+                    if (feedingConfig) feedingConfig.style.display = 'none';
                     
                     // Hide unit buttons when validation fails
                     const unitButtons = document.getElementById('unitButtons');
@@ -3132,15 +3576,44 @@ const CALCULATOR_CONFIG = {
                     
                     if (energyPer100g && energyPer100g > 0.1 && fs.percentage > 0) {
                         const dailyCaloriesForThisFood = (this.currentMER * fs.percentage) / 100;
-                        const dailyGramsForThisFood = (dailyCaloriesForThisFood / energyPer100g) * 100;
+                        let dailyGramsForThisFood;
+                        let dailyCupsForThisFood = null;
+                        
+                        // For kcal/cup, calculate cups directly from calories
+                        if (fs.energyUnit === 'kcalcup' && fs.energy) {
+                            const caloriesPerCup = parseFloat(fs.energy);
+                            dailyCupsForThisFood = dailyCaloriesForThisFood / caloriesPerCup;
+                            // We still need grams for total calculation, use approximation
+                            dailyGramsForThisFood = (dailyCaloriesForThisFood / energyPer100g) * 100;
+                            console.log('Cups calculation:', {
+                                caloriesPerCup,
+                                dailyCaloriesForThisFood,
+                                dailyCupsForThisFood,
+                                dailyGramsForThisFood
+                            });
+                        } else {
+                            // For other units, calculate grams normally
+                            dailyGramsForThisFood = (dailyCaloriesForThisFood / energyPer100g) * 100;
+                        }
+                        
+                        // Calculate per-meal amounts if needed
+                        const displayGrams = this.showPerMeal ? dailyGramsForThisFood / this.mealsPerDay : dailyGramsForThisFood;
+                        const displayCups = dailyCupsForThisFood !== null ? 
+                            (this.showPerMeal ? dailyCupsForThisFood / this.mealsPerDay : dailyCupsForThisFood) : null;
+                        const displayCalories = this.showPerMeal ? dailyCaloriesForThisFood / this.mealsPerDay : dailyCaloriesForThisFood;
                         
                         foodBreakdowns.push({
                             name: fs.name,
                             percentage: fs.percentage,
                             dailyGrams: dailyGramsForThisFood,
+                            displayGrams: displayGrams,
+                            dailyCups: dailyCupsForThisFood,
+                            displayCups: displayCups,
                             calories: dailyCaloriesForThisFood,
+                            displayCalories: displayCalories,
                             isLocked: fs.isLocked,
-                            hasEnergyContent: true
+                            hasEnergyContent: true,
+                            foodSource: fs  // Store reference for cups conversion
                         });
                         
                         totalDailyGrams += dailyGramsForThisFood;
@@ -3151,9 +3624,14 @@ const CALCULATOR_CONFIG = {
                             name: fs.name,
                             percentage: fs.percentage,
                             dailyGrams: 0,
+                            displayGrams: 0,
+                            dailyCups: null,
+                            displayCups: null,
                             calories: 0,
+                            displayCalories: 0,
                             isLocked: fs.isLocked,
-                            hasEnergyContent: false
+                            hasEnergyContent: false,
+                            foodSource: fs  // Store reference for cups conversion
                         });
                     }
                 });
@@ -3169,6 +3647,7 @@ const CALCULATOR_CONFIG = {
                     
                     dailyFoodResults.style.display = 'none';
                     if (foodBreakdownResults) foodBreakdownResults.style.display = 'none';
+                    if (feedingConfig) feedingConfig.style.display = 'none';
                     
                     // Hide unit buttons when no valid foods
                     const unitButtons = document.getElementById('unitButtons');
@@ -3215,6 +3694,17 @@ const CALCULATOR_CONFIG = {
                 // Update daily food results (total) - will be updated with proper units later
                 dailyFoodResults.style.display = 'block';
                 
+                // Show feeding configuration when we have valid foods
+                if (feedingConfig) {
+                    feedingConfig.style.display = 'block';
+                    
+                    // Ensure "Per day" is checked when feeding config becomes visible
+                    const showDaily = document.getElementById('showDaily');
+                    if (showDaily && !showDaily.checked && !document.getElementById('showPerMeal').checked) {
+                        showDaily.checked = true;
+                    }
+                }
+                
                 // Show unit buttons when daily results are shown
                 const unitButtons = document.getElementById('unitButtons');
                 if (unitButtons) unitButtons.style.display = 'flex';
@@ -3222,9 +3712,21 @@ const CALCULATOR_CONFIG = {
                 // Update per-food breakdown
                 if (foodBreakdownList && foodBreakdowns.length > 1) {
                     const breakdownHTML = foodBreakdowns.map(breakdown => {
-                        const valueContent = breakdown.hasEnergyContent 
+                        let valueContent;
-                            ? `${this.formatNumber(this.convertUnits(breakdown.dailyGrams, unit), decimals)} ${unitLabel}/day`
+                        if (breakdown.hasEnergyContent) {
-                            : `<span class="dog-calculator-warning" title="Enter energy content to calculate amount">⚠️</span>`;
+                            if (unit === 'cups') {
+                                // For cups, use the pre-calculated cups value if available
+                                if (breakdown.displayCups !== null) {
+                                    valueContent = `${this.formatNumber(breakdown.displayCups, decimals)} ${unitLabel}${frequencySuffix}`;
+                                } else {
+                                    valueContent = `<span class="dog-calculator-warning" title="Cups only available for foods with kcal/cup measurement">N/A</span>`;
+                                }
+                            } else {
+                                valueContent = `${this.formatNumber(this.convertUnits(breakdown.displayGrams, unit), decimals)} ${unitLabel}${frequencySuffix}`;
+                            }
+                        } else {
+                            valueContent = `<span class="dog-calculator-warning" title="Enter energy content to calculate amount">⚠️</span>`;
+                        }
                         
                         return `
                             <div class="dog-calculator-food-result-item">
@@ -3243,8 +3745,41 @@ const CALCULATOR_CONFIG = {
                 // Generate individual food amount breakdown
                 
                 // Update daily food value with correct units
-                const convertedDailyTotal = this.convertUnits(totalDailyGrams, unit);
+                const displayTotal = this.showPerMeal ? totalDailyGrams / this.mealsPerDay : totalDailyGrams;
-                dailyFoodValue.textContent = this.formatNumber(convertedDailyTotal, decimals) + ` ${unitLabel}/day`;
+                let convertedTotal;
+                let totalDisplayText;
+                
+                if (unit === 'cups') {
+                    console.log('Unit is cups, checking validity...');
+                    // For cups, we can only show total if all foods with percentage > 0 have kcal/cup
+                    const validForCups = foodBreakdowns.filter(b => b.percentage > 0)
+                        .every(b => b.displayCups !== null && b.displayCups !== undefined);
+                    
+                    console.log('Valid for cups?', validForCups, 'Breakdowns:', foodBreakdowns);
+                    
+                    if (validForCups) {
+                        // Calculate total cups using pre-calculated values
+                        let totalCups = 0;
+                        foodBreakdowns.forEach(breakdown => {
+                            if (breakdown.percentage > 0 && breakdown.displayCups !== null) {
+                                totalCups += breakdown.displayCups;
+                            }
+                        });
+                        console.log('Total cups display:', {
+                            totalCups,
+                            displayTotal,
+                            foodBreakdowns: foodBreakdowns.map(b => ({ name: b.name, displayCups: b.displayCups }))
+                        });
+                        totalDisplayText = this.formatNumber(totalCups, decimals) + ` ${unitLabel}${frequencySuffix}`;
+                    } else {
+                        totalDisplayText = 'Mixed units - see breakdown';
+                    }
+                } else {
+                    convertedTotal = this.convertUnits(displayTotal, unit);
+                    totalDisplayText = this.formatNumber(convertedTotal, decimals) + ` ${unitLabel}${frequencySuffix}`;
+                }
+                
+                dailyFoodValue.textContent = totalDisplayText;
                 
                 // Build HTML for individual food amounts
                 const foodAmountsHTML = foodBreakdowns.map(breakdown => {
@@ -3265,8 +3800,24 @@ const CALCULATOR_CONFIG = {
                             </div>
                         `;
                     } else {
-                        const totalGramsForDays = breakdown.dailyGrams * numDays;
+                        // For multi-day calculations: show total amount for all days
-                        const convertedAmount = this.convertUnits(totalGramsForDays, unit);
+                        let amountDisplay;
+                        if (unit === 'cups') {
+                            // For cups, use pre-calculated cups value
+                            if (breakdown.dailyCups !== null) {
+                                const totalCupsForDays = breakdown.dailyCups * numDays;
+                                amountDisplay = `${this.formatNumber(totalCupsForDays, decimals)} ${unitLabel}`;
+                            } else {
+                                amountDisplay = `<span class="dog-calculator-warning" title="Cups only available for foods with kcal/cup measurement">N/A</span>`;
+                            }
+                        } else {
+                            // For other units, calculate from grams
+                            const totalGramsForDays = this.showPerMeal 
+                                ? (breakdown.dailyGrams / this.mealsPerDay) * numDays * this.mealsPerDay
+                                : breakdown.dailyGrams * numDays;
+                            const convertedAmount = this.convertUnits(totalGramsForDays, unit);
+                            amountDisplay = `${this.formatNumber(convertedAmount, decimals)} ${unitLabel}`;
+                        }
                         
                         return `
                             <div class="dog-calculator-food-amount-item">
@@ -3276,7 +3827,7 @@ const CALCULATOR_CONFIG = {
                                     ${lockIndicator}
                                 </div>
                                 <div class="dog-calculator-food-amount-value">
-                                    ${this.formatNumber(convertedAmount, decimals)} ${unitLabel}
+                                    ${amountDisplay}
                                 </div>
                             </div>
                         `;
@@ -3285,7 +3836,6 @@ const CALCULATOR_CONFIG = {
                 
                 // Calculate and display total
                 const totalFoodGrams = totalDailyGrams * numDays;
-                const totalConverted = this.convertUnits(totalFoodGrams, unit);
                 
                 // Update the display
                 if (foodAmountsList) {
@@ -3293,7 +3843,27 @@ const CALCULATOR_CONFIG = {
                 }
                 
                 if (totalAmountDisplay) {
-                    totalAmountDisplay.textContent = `${this.formatNumber(totalConverted, decimals)} ${unitLabel}`;
+                    if (unit === 'cups') {
+                        // For cups total, check if all foods can be converted
+                        const validForCups = foodBreakdowns.filter(b => b.percentage > 0)
+                            .every(b => b.dailyCups !== null && b.dailyCups !== undefined);
+                        
+                        if (validForCups) {
+                            // Calculate total cups using pre-calculated values
+                            let totalCups = 0;
+                            foodBreakdowns.forEach(breakdown => {
+                                if (breakdown.percentage > 0 && breakdown.dailyCups !== null) {
+                                    totalCups += breakdown.dailyCups * numDays;
+                                }
+                            });
+                            totalAmountDisplay.textContent = `${this.formatNumber(totalCups, decimals)} ${unitLabel}`;
+                        } else {
+                            totalAmountDisplay.textContent = 'Mixed units - see individual amounts';
+                        }
+                    } else {
+                        const totalConverted = this.convertUnits(totalFoodGrams, unit);
+                        totalAmountDisplay.textContent = `${this.formatNumber(totalConverted, decimals)} ${unitLabel}`;
+                    }
                 }
                 
                 foodAmountsSection.style.display = 'block';

src/css/main.css

@@ -437,4 +437,102 @@
             }
         }
 
+        /* Feeding Configuration Styles */
+        .dog-calculator-container .dog-calculator-feeding-config {
+            margin-top: 20px;
+            padding: 16px;
+            background: var(--bg-tertiary);
+            border: 1px solid var(--border-color);
+            border-radius: 8px;
+        }
+
+        .dog-calculator-container .dog-calculator-frequency-row {
+            display: flex;
+            align-items: center;
+            gap: 16px;
+            flex-wrap: wrap;
+        }
+
+        .dog-calculator-container .dog-calculator-frequency-row > label {
+            font-weight: 500;
+            color: var(--text-label);
+            margin: 0;
+        }
+
+        .dog-calculator-container .dog-calculator-radio-group {
+            display: flex;
+            gap: 20px;
+            align-items: center;
+        }
+
+        .dog-calculator-container .dog-calculator-radio-group label {
+            display: flex;
+            align-items: center;
+            gap: 6px;
+            cursor: pointer;
+            color: var(--text-primary);
+            font-size: 0.95rem;
+        }
+
+        .dog-calculator-container .dog-calculator-radio-group input[type="radio"] {
+            cursor: pointer;
+            margin: 0;
+        }
+
+        .dog-calculator-container .dog-calculator-radio-group input[type="radio"]:checked + span {
+            font-weight: 600;
+            color: var(--accent-color);
+        }
+
+        .dog-calculator-container .dog-calculator-meal-input {
+            display: inline-flex;
+            align-items: center;
+            gap: 6px;
+            margin: 0 auto;
+        }
+
+        .dog-calculator-container .dog-calculator-meal-input span {
+            color: var(--text-secondary);
+            font-size: 0.95rem;
+        }
+
+        .dog-calculator-container .dog-calculator-meal-input input[type="number"] {
+            width: 50px;
+            padding: 4px 8px;
+            border: 1px solid var(--border-color);
+            border-radius: 4px;
+            font-size: 0.95rem;
+            color: var(--text-primary);
+            background: var(--bg-secondary);
+            text-align: center;
+        }
+
+        .dog-calculator-container .dog-calculator-meal-input input[type="number"]:focus {
+            outline: none;
+            border-color: var(--accent-color);
+            box-shadow: 0 0 0 2px rgba(241, 154, 95, 0.1);
+        }
+
+        /* Update meal note styling */
+        .dog-calculator-container #mealNote {
+            color: var(--text-secondary);
+            font-size: 0.9rem;
+            font-weight: normal;
+            margin-left: 4px;
+        }
+
+        /* Mobile responsive adjustments for feeding config */
+        @media (max-width: 480px) {
+            .dog-calculator-meal-input {
+                margin-left: 0;
+                width: 100%;
+                margin-top: 8px;
+            }
+            
+            .dog-calculator-frequency-row {
+                flex-direction: column;
+                align-items: flex-start;
+            }
+        }
+
         /* Dark theme - manual override */

src/css/themes.css

@@ -1,9 +1,13 @@
         .dog-calculator-container.theme-dark {
             --bg-primary: #24202d;
             --bg-secondary: #312b3b;
+            --bg-tertiary: #1f1b26;
             --border-color: #433c4f;
             --text-primary: #f5f3f7;
             --text-secondary: #b8b0c2;
+            --text-label: #9f94ae;
+            --success-color: #7fa464;
+            --error-color: #e87159;
             color: var(--text-primary);
         }
             
@@ -106,6 +110,19 @@
             background: #f19a5f;
             color: white;
         }
+
+        .dog-calculator-container.theme-dark .dog-calculator-unit-btn:disabled {
+            opacity: 0.5;
+            cursor: not-allowed;
+            border-color: var(--border-color);
+            background: var(--bg-tertiary);
+            color: var(--text-secondary);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-unit-btn:disabled:hover {
+            border-color: var(--border-color);
+            background: var(--bg-tertiary);
+        }
             
         .dog-calculator-container.theme-dark .dog-calculator-results {
             background: linear-gradient(135deg, rgba(241, 154, 95, 0.15) 0%, rgba(241, 154, 95, 0.08) 100%);
@@ -148,14 +165,55 @@
             color: var(--success-color);
         }
 
+        /* Dark theme feeding configuration styles */
+        .dog-calculator-container.theme-dark .dog-calculator-feeding-config {
+            background: var(--bg-tertiary);
+            border-color: var(--border-color);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-frequency-row > label {
+            color: var(--text-label);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-radio-group label {
+            color: var(--text-primary);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-radio-group input[type="radio"]:checked + span {
+            color: #f19a5f;
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-meal-input span {
+            color: var(--text-secondary);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-meal-input input[type="number"] {
+            background: var(--bg-secondary);
+            border-color: var(--border-color);
+            color: var(--text-primary);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-meal-input input[type="number"]:focus {
+            border-color: #f19a5f;
+            box-shadow: 0 0 0 2px rgba(241, 154, 95, 0.15);
+        }
+
+        .dog-calculator-container.theme-dark #mealNote {
+            color: var(--text-secondary);
+        }
+
         /* System theme - follows user's OS preference */
         @media (prefers-color-scheme: dark) {
             .dog-calculator-container.theme-system {
                 --bg-primary: #24202d;
                 --bg-secondary: #312b3b;
+                --bg-tertiary: #1f1b26;
                 --border-color: #433c4f;
                 --text-primary: #f5f3f7;
                 --text-secondary: #b8b0c2;
+                --text-label: #9f94ae;
+                --success-color: #7fa464;
+                --error-color: #e87159;
                 color: var(--text-primary);
             }
             
@@ -258,6 +316,19 @@
                 background: #f19a5f;
                 color: white;
             }
+
+            .dog-calculator-container.theme-system .dog-calculator-unit-btn:disabled {
+                opacity: 0.5;
+                cursor: not-allowed;
+                border-color: var(--border-color);
+                background: var(--bg-tertiary);
+                color: var(--text-secondary);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-unit-btn:disabled:hover {
+                border-color: var(--border-color);
+                background: var(--bg-tertiary);
+            }
             
             .dog-calculator-container.theme-system .dog-calculator-results {
                 background: linear-gradient(135deg, rgba(241, 154, 95, 0.15) 0%, rgba(241, 154, 95, 0.08) 100%);
@@ -299,6 +370,43 @@
                 border-color: var(--success-color);
                 color: var(--success-color);
             }
+
+            /* System theme feeding configuration styles in dark mode */
+            .dog-calculator-container.theme-system .dog-calculator-feeding-config {
+                background: var(--bg-tertiary);
+                border-color: var(--border-color);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-frequency-row > label {
+                color: var(--text-label);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-radio-group label {
+                color: var(--text-primary);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-radio-group input[type="radio"]:checked + span {
+                color: #f19a5f;
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-meal-input span {
+                color: var(--text-secondary);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-meal-input input[type="number"] {
+                background: var(--bg-secondary);
+                border-color: var(--border-color);
+                color: var(--text-primary);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-meal-input input[type="number"]:focus {
+                border-color: #f19a5f;
+                box-shadow: 0 0 0 2px rgba(241, 154, 95, 0.15);
+            }
+
+            .dog-calculator-container.theme-system #mealNote {
+                color: var(--text-secondary);
+            }
         }
 
         /* Modal Styles */
@@ -1208,6 +1316,20 @@
             color: white;
         }
 
+        .dog-calculator-unit-btn:disabled {
+            opacity: 0.5;
+            cursor: not-allowed;
+            border-color: var(--border-color);
+            background: var(--bg-tertiary);
+            color: var(--text-secondary);
+        }
+
+        .dog-calculator-unit-btn:disabled:hover {
+            border-color: var(--border-color);
+            background: var(--bg-tertiary);
+            transform: none;
+        }
+
         /* Hidden unit select for compatibility */
         .dog-calculator-unit-select-hidden {
             display: none;

src/index.html

@@ -65,6 +65,28 @@
                         <span>Add another food source</span>
                     </button>
 
+                    <!-- Feeding Configuration -->
+                    <div class="dog-calculator-feeding-config" id="feedingConfig" style="display: none;">
+                        <div class="dog-calculator-frequency-row">
+                            <label>Show amounts:</label>
+                            <div class="dog-calculator-radio-group">
+                                <label>
+                                    <input type="radio" name="showAs" value="daily" id="showDaily" checked>
+                                    <span>Per day</span>
+                                </label>
+                                <label>
+                                    <input type="radio" name="showAs" value="meal" id="showPerMeal">
+                                    <span>Per meal</span>
+                                </label>
+                            </div>
+                            <div class="dog-calculator-meal-input" id="mealInputGroup" style="display: none;">
+                                <span>×</span>
+                                <input type="number" id="mealsPerDay" value="2" min="1" max="10">
+                                <span>meals/day</span>
+                            </div>
+                        </div>
+                    </div>
+
                     <!-- Per-Food Results -->
                     <div class="dog-calculator-food-results" id="foodBreakdownResults" style="display: none;">
                         <div id="foodBreakdownList">
@@ -78,6 +100,7 @@
                         <button type="button" class="dog-calculator-unit-btn" data-unit="kg">kg</button>
                         <button type="button" class="dog-calculator-unit-btn" data-unit="oz">oz</button>
                         <button type="button" class="dog-calculator-unit-btn" data-unit="lb">lb</button>
+                        <button type="button" class="dog-calculator-unit-btn" data-unit="cups" id="cupsButton" disabled title="Available when using kcal/cup measurement">cups</button>
                     </div>
 
                     <!-- Daily Total Results -->
@@ -94,13 +117,14 @@
                         <option value="kg">kilograms (kg)</option>
                         <option value="oz">ounces (oz)</option>
                         <option value="lb">pounds (lb)</option>
+                        <option value="cups">cups</option>
                     </select>
 
                     <div class="dog-calculator-food-amounts-section" id="foodAmountsSection" style="display: none;">
                         <h4 class="dog-calculator-section-title">
                             Calculate amounts for 
                             <input type="number" id="days" min="1" step="1" value="1" placeholder="1" aria-describedby="daysHelp" class="dog-calculator-inline-days"> 
-                            <span id="dayLabel">day</span>:
+                            <span id="dayLabel">day</span><span id="mealNote" style="display: none;"></span>:
                         </h4>
                         <div id="daysError" class="dog-calculator-error dog-calculator-hidden">Please enter a valid number of days (minimum 1)</div>
                         <div id="foodAmountsList" class="dog-calculator-food-amounts-list">

src/js/calculator.js

@@ -11,6 +11,8 @@
                 this.scale = this.getScaleFromURL() || CALCULATOR_CONFIG.defaultScale;
                 this.foodSources = [];
                 this.maxFoodSources = CALCULATOR_CONFIG.maxFoodSources;
+                this.mealsPerDay = 2;
+                this.showPerMeal = false;
                 this.init();
             }
 
@@ -587,7 +589,36 @@
                 if (energyInput) {
                     energyInput.addEventListener('input', () => {
                         this.updateFoodSourceData(id, 'energy', energyInput.value);
-                        this.updateFoodCalculations();
+                        
+                        // Auto-select cups when entering energy for kcal/cup
+                        const foodSource = this.foodSources.find(fs => fs.id === id);
+                        if (foodSource && foodSource.energyUnit === 'kcalcup' && parseFloat(energyInput.value) > 0) {
+                            const unitSelect = document.getElementById('unit');
+                            const cupsButton = document.getElementById('cupsButton');
+                            
+                            // First check if cups button will be enabled after update
+                            const willEnableCups = this.foodSources.some(fs => 
+                                fs.energyUnit === 'kcalcup' && fs.energy && parseFloat(fs.energy) > 0
+                            );
+                            
+                            if (willEnableCups && unitSelect) {
+                                // Set cups BEFORE updating calculations
+                                unitSelect.value = 'cups';
+                                unitSelect.setAttribute('value', 'cups');
+                                this.setActiveUnitButton('cups');
+                                
+                                // Enable the cups button manually since we know it will be valid
+                                if (cupsButton) {
+                                    cupsButton.disabled = false;
+                                    cupsButton.title = 'Show amounts in cups';
+                                }
+                            }
+                            
+                            // Now update calculations with cups already selected
+                            this.updateFoodCalculations();
+                        } else {
+                            this.updateFoodCalculations();
+                        }
                     });
                     energyInput.addEventListener('blur', () => this.validateFoodSourceEnergy(id));
                 }
@@ -595,7 +626,54 @@
                 if (energyUnitSelect) {
                     energyUnitSelect.addEventListener('change', () => {
                         this.updateFoodSourceData(id, 'energyUnit', energyUnitSelect.value);
-                        this.updateFoodCalculations();
+                        
+                        // Auto-select the most appropriate unit based on energy unit
+                        const unitSelect = document.getElementById('unit');
+                        const energyInput = document.getElementById(`energy-${id}`);
+                        
+                        if (unitSelect) {
+                            switch(energyUnitSelect.value) {
+                                case 'kcalcup':
+                                    // Check if we have energy value to enable cups
+                                    const foodSource = this.foodSources.find(fs => fs.id === id);
+                                    if (foodSource && foodSource.energy && parseFloat(foodSource.energy) > 0) {
+                                        // Set cups BEFORE updating calculations
+                                        unitSelect.value = 'cups';
+                                        unitSelect.setAttribute('value', 'cups');
+                                        this.setActiveUnitButton('cups');
+                                        
+                                        // Enable the cups button manually
+                                        const cupsButton = document.getElementById('cupsButton');
+                                        if (cupsButton) {
+                                            cupsButton.disabled = false;
+                                            cupsButton.title = 'Show amounts in cups';
+                                        }
+                                    }
+                                    this.updateFoodCalculations();
+                                    break;
+                                case 'kcal100g':
+                                    // For kcal/100g, select grams
+                                    unitSelect.value = 'g';
+                                    this.setActiveUnitButton('g');
+                                    this.updateFoodCalculations();
+                                    break;
+                                case 'kcalkg':
+                                    // For kcal/kg, also select grams (or could be kg)
+                                    unitSelect.value = 'g';
+                                    this.setActiveUnitButton('g');
+                                    this.updateFoodCalculations();
+                                    break;
+                                case 'kcalcan':
+                                    // For kcal/can, use grams as default (or ounces in imperial)
+                                    unitSelect.value = this.isImperial ? 'oz' : 'g';
+                                    this.setActiveUnitButton(unitSelect.value);
+                                    this.updateFoodCalculations();
+                                    break;
+                            }
+                        } else {
+                            // No unit select, just update calculations
+                            this.updateFoodCalculations();
+                        }
                     });
                 }
 
@@ -765,6 +843,58 @@
 
                 if (addFoodBtn) addFoodBtn.addEventListener('click', () => this.addFoodSource());
 
+                // Feeding configuration event listeners
+                const showDaily = document.getElementById('showDaily');
+                const showPerMeal = document.getElementById('showPerMeal');
+                const mealsPerDayInput = document.getElementById('mealsPerDay');
+                const mealInputGroup = document.getElementById('mealInputGroup');
+
+                if (showDaily) {
+                    showDaily.addEventListener('change', () => {
+                        if (showDaily.checked) {
+                            this.showPerMeal = false;
+                            if (mealInputGroup) mealInputGroup.style.display = 'none';
+                            this.updateDayLabel();
+                            this.updateFoodCalculations();
+                        }
+                    });
+                }
+
+                if (showPerMeal) {
+                    showPerMeal.addEventListener('change', () => {
+                        if (showPerMeal.checked) {
+                            this.showPerMeal = true;
+                            if (mealInputGroup) mealInputGroup.style.display = 'inline-flex';
+                            this.updateDayLabel();
+                            this.updateFoodCalculations();
+                        }
+                    });
+                }
+
+                if (mealsPerDayInput) {
+                    mealsPerDayInput.addEventListener('input', () => {
+                        const meals = parseInt(mealsPerDayInput.value);
+                        if (meals && meals >= 1 && meals <= 10) {
+                            this.mealsPerDay = meals;
+                            if (this.showPerMeal) {
+                                this.updateDayLabel();
+                                this.updateFoodCalculations();
+                            }
+                        }
+                    });
+
+                    mealsPerDayInput.addEventListener('blur', () => {
+                        if (!mealsPerDayInput.value || parseInt(mealsPerDayInput.value) < 1) {
+                            mealsPerDayInput.value = 2;
+                            this.mealsPerDay = 2;
+                            if (this.showPerMeal) {
+                                this.updateDayLabel();
+                                this.updateFoodCalculations();
+                            }
+                        }
+                    });
+                }
+
                 // Modal event listeners
                 const shareBtn = document.getElementById('shareBtn');
                 const embedBtn = document.getElementById('embedBtn');
@@ -941,7 +1071,7 @@
                 }
             }
 
-            convertUnits(grams, unit) {
+            convertUnits(grams, unit, foodSource = null) {
                 switch (unit) {
                     case 'kg':
                         return grams / 1000;
@@ -949,6 +1079,18 @@
                         return grams / 28.3495;
                     case 'lb':
                         return grams / 453.592;
+                    case 'cups':
+                        // For cups, we need to convert from grams worth of calories to cups
+                        if (foodSource && foodSource.energyUnit === 'kcalcup' && foodSource.energy) {
+                            // Get calories per 100g for this food
+                            const caloriesPerGram = this.getFoodSourceEnergyPer100g(foodSource) / 100;
+                            // Calculate total calories represented by these grams
+                            const totalCalories = grams * caloriesPerGram;
+                            // Divide by calories per cup to get number of cups
+                            const caloriesPerCup = parseFloat(foodSource.energy);
+                            return totalCalories / caloriesPerCup;
+                        }
+                        return null; // Cannot convert to cups without kcal/cup
                     default:
                         return grams;
                 }
@@ -983,10 +1125,21 @@
             updateDayLabel() {
                 const days = document.getElementById('days')?.value;
                 const dayLabel = document.getElementById('dayLabel');
+                const mealNote = document.getElementById('mealNote');
                 if (dayLabel && days) {
                     const numDays = parseInt(days);
                     dayLabel.textContent = numDays === 1 ? 'day' : 'days';
                 }
+                if (mealNote) {
+                    if (this.showPerMeal && days) {
+                        const numDays = parseInt(days);
+                        const totalMeals = numDays * this.mealsPerDay;
+                        mealNote.textContent = ` (${totalMeals} meal${totalMeals === 1 ? '' : 's'} total)`;
+                        mealNote.style.display = 'inline';
+                    } else {
+                        mealNote.style.display = 'none';
+                    }
+                }
             }
 
             setActiveUnitButton(unit) {
@@ -1041,6 +1194,31 @@
                 this.sendHeightToParent();
             }
 
+            updateCupsButtonState() {
+                const cupsButton = document.getElementById('cupsButton');
+                if (!cupsButton) return;
+                
+                // Check if any food source has kcal/cup selected
+                const hasKcalCup = this.foodSources.some(fs => 
+                    fs.energyUnit === 'kcalcup' && fs.energy && parseFloat(fs.energy) > 0
+                );
+                
+                if (hasKcalCup) {
+                    cupsButton.disabled = false;
+                    cupsButton.title = 'Show amounts in cups';
+                } else {
+                    cupsButton.disabled = true;
+                    cupsButton.title = 'Available when using kcal/cup measurement';
+                    
+                    // If cups was selected, switch back to grams
+                    const unitSelect = document.getElementById('unit');
+                    if (unitSelect && unitSelect.value === 'cups') {
+                        unitSelect.value = 'g';
+                        this.setActiveUnitButton('g');
+                    }
+                }
+            }
+
             updateFoodCalculations() {
                 if (this.currentMER === 0) return;
                 
@@ -1053,15 +1231,36 @@
                 const totalAmountDisplay = document.getElementById('totalAmountDisplay');
                 const foodBreakdownResults = document.getElementById('foodBreakdownResults');
                 const foodBreakdownList = document.getElementById('foodBreakdownList');
+                const feedingConfig = document.getElementById('feedingConfig');
+                
+                // Update cups button state
+                this.updateCupsButtonState();
 
                 if (!daysInput || !unitSelect || !dailyFoodResults || !dailyFoodValue || !foodAmountsSection) {
                     return;
                 }
 
                 const days = daysInput.value;
-                const unit = unitSelect.value;
+                let unit = unitSelect.value;
-                const unitLabel = unit === 'g' ? 'g' : unit === 'kg' ? 'kg' : unit === 'oz' ? 'oz' : 'lb';
+                
-                const decimals = unit === 'g' ? 0 : unit === 'kg' ? 2 : 1;
+                // Failsafe: if unit is empty string but cups button is active, use 'cups'
+                if (!unit || unit === '') {
+                    const activeButton = document.querySelector('.dog-calculator-unit-btn.active');
+                    if (activeButton) {
+                        unit = activeButton.dataset.unit || 'g';
+                    } else {
+                        unit = 'g'; // Default fallback
+                    }
+                }
+                
+                const unitLabel = unit === 'g' ? 'g' : unit === 'kg' ? 'kg' : unit === 'oz' ? 'oz' : unit === 'lb' ? 'lb' : 'cups';
+                const decimals = unit === 'g' ? 0 : unit === 'kg' ? 2 : unit === 'cups' ? 1 : 1;
+                
+                // Debug: log what unit is being used
+                console.log('UpdateFoodCalculations - unit:', unit, 'unitLabel:', unitLabel);
+                
+                // Determine frequency suffix for display
+                const frequencySuffix = this.showPerMeal ? '/meal' : '/day';
                 
                 // Clear all food source errors first
                 this.foodSources.forEach(fs => {
@@ -1075,6 +1274,7 @@
                     foodAmountsSection.style.display = 'none';
                     dailyFoodResults.style.display = 'none';
                     if (foodBreakdownResults) foodBreakdownResults.style.display = 'none';
+                    if (feedingConfig) feedingConfig.style.display = 'none';
                     
                     // Hide unit buttons when validation fails
                     const unitButtons = document.getElementById('unitButtons');
@@ -1094,15 +1294,44 @@
                     
                     if (energyPer100g && energyPer100g > 0.1 && fs.percentage > 0) {
                         const dailyCaloriesForThisFood = (this.currentMER * fs.percentage) / 100;
-                        const dailyGramsForThisFood = (dailyCaloriesForThisFood / energyPer100g) * 100;
+                        let dailyGramsForThisFood;
+                        let dailyCupsForThisFood = null;
+                        
+                        // For kcal/cup, calculate cups directly from calories
+                        if (fs.energyUnit === 'kcalcup' && fs.energy) {
+                            const caloriesPerCup = parseFloat(fs.energy);
+                            dailyCupsForThisFood = dailyCaloriesForThisFood / caloriesPerCup;
+                            // We still need grams for total calculation, use approximation
+                            dailyGramsForThisFood = (dailyCaloriesForThisFood / energyPer100g) * 100;
+                            console.log('Cups calculation:', {
+                                caloriesPerCup,
+                                dailyCaloriesForThisFood,
+                                dailyCupsForThisFood,
+                                dailyGramsForThisFood
+                            });
+                        } else {
+                            // For other units, calculate grams normally
+                            dailyGramsForThisFood = (dailyCaloriesForThisFood / energyPer100g) * 100;
+                        }
+                        
+                        // Calculate per-meal amounts if needed
+                        const displayGrams = this.showPerMeal ? dailyGramsForThisFood / this.mealsPerDay : dailyGramsForThisFood;
+                        const displayCups = dailyCupsForThisFood !== null ? 
+                            (this.showPerMeal ? dailyCupsForThisFood / this.mealsPerDay : dailyCupsForThisFood) : null;
+                        const displayCalories = this.showPerMeal ? dailyCaloriesForThisFood / this.mealsPerDay : dailyCaloriesForThisFood;
                         
                         foodBreakdowns.push({
                             name: fs.name,
                             percentage: fs.percentage,
                             dailyGrams: dailyGramsForThisFood,
+                            displayGrams: displayGrams,
+                            dailyCups: dailyCupsForThisFood,
+                            displayCups: displayCups,
                             calories: dailyCaloriesForThisFood,
+                            displayCalories: displayCalories,
                             isLocked: fs.isLocked,
-                            hasEnergyContent: true
+                            hasEnergyContent: true,
+                            foodSource: fs  // Store reference for cups conversion
                         });
                         
                         totalDailyGrams += dailyGramsForThisFood;
@@ -1113,9 +1342,14 @@
                             name: fs.name,
                             percentage: fs.percentage,
                             dailyGrams: 0,
+                            displayGrams: 0,
+                            dailyCups: null,
+                            displayCups: null,
                             calories: 0,
+                            displayCalories: 0,
                             isLocked: fs.isLocked,
-                            hasEnergyContent: false
+                            hasEnergyContent: false,
+                            foodSource: fs  // Store reference for cups conversion
                         });
                     }
                 });
@@ -1131,6 +1365,7 @@
                     
                     dailyFoodResults.style.display = 'none';
                     if (foodBreakdownResults) foodBreakdownResults.style.display = 'none';
+                    if (feedingConfig) feedingConfig.style.display = 'none';
                     
                     // Hide unit buttons when no valid foods
                     const unitButtons = document.getElementById('unitButtons');
@@ -1177,6 +1412,17 @@
                 // Update daily food results (total) - will be updated with proper units later
                 dailyFoodResults.style.display = 'block';
                 
+                // Show feeding configuration when we have valid foods
+                if (feedingConfig) {
+                    feedingConfig.style.display = 'block';
+                    
+                    // Ensure "Per day" is checked when feeding config becomes visible
+                    const showDaily = document.getElementById('showDaily');
+                    if (showDaily && !showDaily.checked && !document.getElementById('showPerMeal').checked) {
+                        showDaily.checked = true;
+                    }
+                }
+                
                 // Show unit buttons when daily results are shown
                 const unitButtons = document.getElementById('unitButtons');
                 if (unitButtons) unitButtons.style.display = 'flex';
@@ -1184,9 +1430,21 @@
                 // Update per-food breakdown
                 if (foodBreakdownList && foodBreakdowns.length > 1) {
                     const breakdownHTML = foodBreakdowns.map(breakdown => {
-                        const valueContent = breakdown.hasEnergyContent 
+                        let valueContent;
-                            ? `${this.formatNumber(this.convertUnits(breakdown.dailyGrams, unit), decimals)} ${unitLabel}/day`
+                        if (breakdown.hasEnergyContent) {
-                            : `<span class="dog-calculator-warning" title="Enter energy content to calculate amount">⚠️</span>`;
+                            if (unit === 'cups') {
+                                // For cups, use the pre-calculated cups value if available
+                                if (breakdown.displayCups !== null) {
+                                    valueContent = `${this.formatNumber(breakdown.displayCups, decimals)} ${unitLabel}${frequencySuffix}`;
+                                } else {
+                                    valueContent = `<span class="dog-calculator-warning" title="Cups only available for foods with kcal/cup measurement">N/A</span>`;
+                                }
+                            } else {
+                                valueContent = `${this.formatNumber(this.convertUnits(breakdown.displayGrams, unit), decimals)} ${unitLabel}${frequencySuffix}`;
+                            }
+                        } else {
+                            valueContent = `<span class="dog-calculator-warning" title="Enter energy content to calculate amount">⚠️</span>`;
+                        }
                         
                         return `
                             <div class="dog-calculator-food-result-item">
@@ -1205,8 +1463,41 @@
                 // Generate individual food amount breakdown
                 
                 // Update daily food value with correct units
-                const convertedDailyTotal = this.convertUnits(totalDailyGrams, unit);
+                const displayTotal = this.showPerMeal ? totalDailyGrams / this.mealsPerDay : totalDailyGrams;
-                dailyFoodValue.textContent = this.formatNumber(convertedDailyTotal, decimals) + ` ${unitLabel}/day`;
+                let convertedTotal;
+                let totalDisplayText;
+                
+                if (unit === 'cups') {
+                    console.log('Unit is cups, checking validity...');
+                    // For cups, we can only show total if all foods with percentage > 0 have kcal/cup
+                    const validForCups = foodBreakdowns.filter(b => b.percentage > 0)
+                        .every(b => b.displayCups !== null && b.displayCups !== undefined);
+                    
+                    console.log('Valid for cups?', validForCups, 'Breakdowns:', foodBreakdowns);
+                    
+                    if (validForCups) {
+                        // Calculate total cups using pre-calculated values
+                        let totalCups = 0;
+                        foodBreakdowns.forEach(breakdown => {
+                            if (breakdown.percentage > 0 && breakdown.displayCups !== null) {
+                                totalCups += breakdown.displayCups;
+                            }
+                        });
+                        console.log('Total cups display:', {
+                            totalCups,
+                            displayTotal,
+                            foodBreakdowns: foodBreakdowns.map(b => ({ name: b.name, displayCups: b.displayCups }))
+                        });
+                        totalDisplayText = this.formatNumber(totalCups, decimals) + ` ${unitLabel}${frequencySuffix}`;
+                    } else {
+                        totalDisplayText = 'Mixed units - see breakdown';
+                    }
+                } else {
+                    convertedTotal = this.convertUnits(displayTotal, unit);
+                    totalDisplayText = this.formatNumber(convertedTotal, decimals) + ` ${unitLabel}${frequencySuffix}`;
+                }
+                
+                dailyFoodValue.textContent = totalDisplayText;
                 
                 // Build HTML for individual food amounts
                 const foodAmountsHTML = foodBreakdowns.map(breakdown => {
@@ -1227,8 +1518,24 @@
                             </div>
                         `;
                     } else {
-                        const totalGramsForDays = breakdown.dailyGrams * numDays;
+                        // For multi-day calculations: show total amount for all days
-                        const convertedAmount = this.convertUnits(totalGramsForDays, unit);
+                        let amountDisplay;
+                        if (unit === 'cups') {
+                            // For cups, use pre-calculated cups value
+                            if (breakdown.dailyCups !== null) {
+                                const totalCupsForDays = breakdown.dailyCups * numDays;
+                                amountDisplay = `${this.formatNumber(totalCupsForDays, decimals)} ${unitLabel}`;
+                            } else {
+                                amountDisplay = `<span class="dog-calculator-warning" title="Cups only available for foods with kcal/cup measurement">N/A</span>`;
+                            }
+                        } else {
+                            // For other units, calculate from grams
+                            const totalGramsForDays = this.showPerMeal 
+                                ? (breakdown.dailyGrams / this.mealsPerDay) * numDays * this.mealsPerDay
+                                : breakdown.dailyGrams * numDays;
+                            const convertedAmount = this.convertUnits(totalGramsForDays, unit);
+                            amountDisplay = `${this.formatNumber(convertedAmount, decimals)} ${unitLabel}`;
+                        }
                         
                         return `
                             <div class="dog-calculator-food-amount-item">
@@ -1238,7 +1545,7 @@
                                     ${lockIndicator}
                                 </div>
                                 <div class="dog-calculator-food-amount-value">
-                                    ${this.formatNumber(convertedAmount, decimals)} ${unitLabel}
+                                    ${amountDisplay}
                                 </div>
                             </div>
                         `;
@@ -1247,7 +1554,6 @@
                 
                 // Calculate and display total
                 const totalFoodGrams = totalDailyGrams * numDays;
-                const totalConverted = this.convertUnits(totalFoodGrams, unit);
                 
                 // Update the display
                 if (foodAmountsList) {
@@ -1255,7 +1561,27 @@
                 }
                 
                 if (totalAmountDisplay) {
-                    totalAmountDisplay.textContent = `${this.formatNumber(totalConverted, decimals)} ${unitLabel}`;
+                    if (unit === 'cups') {
+                        // For cups total, check if all foods can be converted
+                        const validForCups = foodBreakdowns.filter(b => b.percentage > 0)
+                            .every(b => b.dailyCups !== null && b.dailyCups !== undefined);
+                        
+                        if (validForCups) {
+                            // Calculate total cups using pre-calculated values
+                            let totalCups = 0;
+                            foodBreakdowns.forEach(breakdown => {
+                                if (breakdown.percentage > 0 && breakdown.dailyCups !== null) {
+                                    totalCups += breakdown.dailyCups * numDays;
+                                }
+                            });
+                            totalAmountDisplay.textContent = `${this.formatNumber(totalCups, decimals)} ${unitLabel}`;
+                        } else {
+                            totalAmountDisplay.textContent = 'Mixed units - see individual amounts';
+                        }
+                    } else {
+                        const totalConverted = this.convertUnits(totalFoodGrams, unit);
+                        totalAmountDisplay.textContent = `${this.formatNumber(totalConverted, decimals)} ${unitLabel}`;
+                    }
                 }
                 
                 foodAmountsSection.style.display = 'block';

sundog-dog-food-calculator.js

@@ -462,14 +462,116 @@
             }
         }
 
+        /* Feeding Configuration Styles */
+        .dog-calculator-container .dog-calculator-feeding-config {
+            margin-top: 20px;
+            padding: 16px;
+            background: var(--bg-tertiary);
+            border: 1px solid var(--border-color);
+            border-radius: 8px;
+        }
+
+        .dog-calculator-container .dog-calculator-frequency-row {
+            display: flex;
+            align-items: center;
+            gap: 16px;
+            flex-wrap: wrap;
+        }
+
+        .dog-calculator-container .dog-calculator-frequency-row > label {
+            font-weight: 500;
+            color: var(--text-label);
+            margin: 0;
+        }
+
+        .dog-calculator-container .dog-calculator-radio-group {
+            display: flex;
+            gap: 20px;
+            align-items: center;
+        }
+
+        .dog-calculator-container .dog-calculator-radio-group label {
+            display: flex;
+            align-items: center;
+            gap: 6px;
+            cursor: pointer;
+            color: var(--text-primary);
+            font-size: 0.95rem;
+        }
+
+        .dog-calculator-container .dog-calculator-radio-group input[type="radio"] {
+            cursor: pointer;
+            margin: 0;
+        }
+
+        .dog-calculator-container .dog-calculator-radio-group input[type="radio"]:checked + span {
+            font-weight: 600;
+            color: var(--accent-color);
+        }
+
+        .dog-calculator-container .dog-calculator-meal-input {
+            display: inline-flex;
+            align-items: center;
+            gap: 6px;
+            margin: 0 auto;
+        }
+
+        .dog-calculator-container .dog-calculator-meal-input span {
+            color: var(--text-secondary);
+            font-size: 0.95rem;
+        }
+
+        .dog-calculator-container .dog-calculator-meal-input input[type="number"] {
+            width: 50px;
+            padding: 4px 8px;
+            border: 1px solid var(--border-color);
+            border-radius: 4px;
+            font-size: 0.95rem;
+            color: var(--text-primary);
+            background: var(--bg-secondary);
+            text-align: center;
+        }
+
+        .dog-calculator-container .dog-calculator-meal-input input[type="number"]:focus {
+            outline: none;
+            border-color: var(--accent-color);
+            box-shadow: 0 0 0 2px rgba(241, 154, 95, 0.1);
+        }
+
+        /* Update meal note styling */
+        .dog-calculator-container #mealNote {
+            color: var(--text-secondary);
+            font-size: 0.9rem;
+            font-weight: normal;
+            margin-left: 4px;
+        }
+
+        /* Mobile responsive adjustments for feeding config */
+        @media (max-width: 480px) {
+            .dog-calculator-meal-input {
+                margin-left: 0;
+                width: 100%;
+                margin-top: 8px;
+            }
+            
+            .dog-calculator-frequency-row {
+                flex-direction: column;
+                align-items: flex-start;
+            }
+        }
+
         /* Dark theme - manual override */
 
 .dog-calculator-container.theme-dark {
             --bg-primary: #24202d;
             --bg-secondary: #312b3b;
+            --bg-tertiary: #1f1b26;
             --border-color: #433c4f;
             --text-primary: #f5f3f7;
             --text-secondary: #b8b0c2;
+            --text-label: #9f94ae;
+            --success-color: #7fa464;
+            --error-color: #e87159;
             color: var(--text-primary);
         }
             
@@ -572,6 +674,19 @@
             background: #f19a5f;
             color: white;
         }
+
+        .dog-calculator-container.theme-dark .dog-calculator-unit-btn:disabled {
+            opacity: 0.5;
+            cursor: not-allowed;
+            border-color: var(--border-color);
+            background: var(--bg-tertiary);
+            color: var(--text-secondary);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-unit-btn:disabled:hover {
+            border-color: var(--border-color);
+            background: var(--bg-tertiary);
+        }
             
         .dog-calculator-container.theme-dark .dog-calculator-results {
             background: linear-gradient(135deg, rgba(241, 154, 95, 0.15) 0%, rgba(241, 154, 95, 0.08) 100%);
@@ -614,14 +729,55 @@
             color: var(--success-color);
         }
 
+        /* Dark theme feeding configuration styles */
+        .dog-calculator-container.theme-dark .dog-calculator-feeding-config {
+            background: var(--bg-tertiary);
+            border-color: var(--border-color);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-frequency-row > label {
+            color: var(--text-label);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-radio-group label {
+            color: var(--text-primary);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-radio-group input[type="radio"]:checked + span {
+            color: #f19a5f;
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-meal-input span {
+            color: var(--text-secondary);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-meal-input input[type="number"] {
+            background: var(--bg-secondary);
+            border-color: var(--border-color);
+            color: var(--text-primary);
+        }
+
+        .dog-calculator-container.theme-dark .dog-calculator-meal-input input[type="number"]:focus {
+            border-color: #f19a5f;
+            box-shadow: 0 0 0 2px rgba(241, 154, 95, 0.15);
+        }
+
+        .dog-calculator-container.theme-dark #mealNote {
+            color: var(--text-secondary);
+        }
+
         /* System theme - follows user's OS preference */
         @media (prefers-color-scheme: dark) {
             .dog-calculator-container.theme-system {
                 --bg-primary: #24202d;
                 --bg-secondary: #312b3b;
+                --bg-tertiary: #1f1b26;
                 --border-color: #433c4f;
                 --text-primary: #f5f3f7;
                 --text-secondary: #b8b0c2;
+                --text-label: #9f94ae;
+                --success-color: #7fa464;
+                --error-color: #e87159;
                 color: var(--text-primary);
             }
             
@@ -724,6 +880,19 @@
                 background: #f19a5f;
                 color: white;
             }
+
+            .dog-calculator-container.theme-system .dog-calculator-unit-btn:disabled {
+                opacity: 0.5;
+                cursor: not-allowed;
+                border-color: var(--border-color);
+                background: var(--bg-tertiary);
+                color: var(--text-secondary);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-unit-btn:disabled:hover {
+                border-color: var(--border-color);
+                background: var(--bg-tertiary);
+            }
             
             .dog-calculator-container.theme-system .dog-calculator-results {
                 background: linear-gradient(135deg, rgba(241, 154, 95, 0.15) 0%, rgba(241, 154, 95, 0.08) 100%);
@@ -765,6 +934,43 @@
                 border-color: var(--success-color);
                 color: var(--success-color);
             }
+
+            /* System theme feeding configuration styles in dark mode */
+            .dog-calculator-container.theme-system .dog-calculator-feeding-config {
+                background: var(--bg-tertiary);
+                border-color: var(--border-color);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-frequency-row > label {
+                color: var(--text-label);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-radio-group label {
+                color: var(--text-primary);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-radio-group input[type="radio"]:checked + span {
+                color: #f19a5f;
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-meal-input span {
+                color: var(--text-secondary);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-meal-input input[type="number"] {
+                background: var(--bg-secondary);
+                border-color: var(--border-color);
+                color: var(--text-primary);
+            }
+
+            .dog-calculator-container.theme-system .dog-calculator-meal-input input[type="number"]:focus {
+                border-color: #f19a5f;
+                box-shadow: 0 0 0 2px rgba(241, 154, 95, 0.15);
+            }
+
+            .dog-calculator-container.theme-system #mealNote {
+                color: var(--text-secondary);
+            }
         }
 
         /* Modal Styles */
@@ -1674,6 +1880,20 @@
             color: white;
         }
 
+        .dog-calculator-unit-btn:disabled {
+            opacity: 0.5;
+            cursor: not-allowed;
+            border-color: var(--border-color);
+            background: var(--bg-tertiary);
+            color: var(--text-secondary);
+        }
+
+        .dog-calculator-unit-btn:disabled:hover {
+            border-color: var(--border-color);
+            background: var(--bg-tertiary);
+            transform: none;
+        }
+
         /* Hidden unit select for compatibility */
         .dog-calculator-unit-select-hidden {
             display: none;
@@ -1890,6 +2110,8 @@ const CALCULATOR_CONFIG = {
                 this.scale = this.getScaleFromURL() || CALCULATOR_CONFIG.defaultScale;
                 this.foodSources = [];
                 this.maxFoodSources = CALCULATOR_CONFIG.maxFoodSources;
+                this.mealsPerDay = 2;
+                this.showPerMeal = false;
                 this.init();
             }
 
@@ -1962,6 +2184,28 @@ const CALCULATOR_CONFIG = {
                         <span>Add another food source</span>
                     </button>
 
+                    <!-- Feeding Configuration -->
+                    <div class="dog-calculator-feeding-config" id="feedingConfig" style="display: none;">
+                        <div class="dog-calculator-frequency-row">
+                            <label>Show amounts:</label>
+                            <div class="dog-calculator-radio-group">
+                                <label>
+                                    <input type="radio" name="showAs" value="daily" id="showDaily" checked>
+                                    <span>Per day</span>
+                                </label>
+                                <label>
+                                    <input type="radio" name="showAs" value="meal" id="showPerMeal">
+                                    <span>Per meal</span>
+                                </label>
+                            </div>
+                            <div class="dog-calculator-meal-input" id="mealInputGroup" style="display: none;">
+                                <span>×</span>
+                                <input type="number" id="mealsPerDay" value="2" min="1" max="10">
+                                <span>meals/day</span>
+                            </div>
+                        </div>
+                    </div>
+
                     <!-- Per-Food Results -->
                     <div class="dog-calculator-food-results" id="foodBreakdownResults" style="display: none;">
                         <div id="foodBreakdownList">
@@ -1975,6 +2219,7 @@ const CALCULATOR_CONFIG = {
                         <button type="button" class="dog-calculator-unit-btn" data-unit="kg">kg</button>
                         <button type="button" class="dog-calculator-unit-btn" data-unit="oz">oz</button>
                         <button type="button" class="dog-calculator-unit-btn" data-unit="lb">lb</button>
+                        <button type="button" class="dog-calculator-unit-btn" data-unit="cups" id="cupsButton" disabled title="Available when using kcal/cup measurement">cups</button>
                     </div>
 
                     <!-- Daily Total Results -->
@@ -1991,13 +2236,14 @@ const CALCULATOR_CONFIG = {
                         <option value="kg">kilograms (kg)</option>
                         <option value="oz">ounces (oz)</option>
                         <option value="lb">pounds (lb)</option>
+                        <option value="cups">cups</option>
                     </select>
 
                     <div class="dog-calculator-food-amounts-section" id="foodAmountsSection" style="display: none;">
                         <h4 class="dog-calculator-section-title">
                             Calculate amounts for 
                             <input type="number" id="days" min="1" step="1" value="1" placeholder="1" aria-describedby="daysHelp" class="dog-calculator-inline-days"> 
-                            <span id="dayLabel">day</span>:
+                            <span id="dayLabel">day</span><span id="mealNote" style="display: none;"></span>:
                         </h4>
                         <div id="daysError" class="dog-calculator-error dog-calculator-hidden">Please enter a valid number of days (minimum 1)</div>
                         <div id="foodAmountsList" class="dog-calculator-food-amounts-list">
@@ -2662,7 +2908,36 @@ const CALCULATOR_CONFIG = {
                 if (energyInput) {
                     energyInput.addEventListener('input', () => {
                         this.updateFoodSourceData(id, 'energy', energyInput.value);
-                        this.updateFoodCalculations();
+                        
+                        // Auto-select cups when entering energy for kcal/cup
+                        const foodSource = this.foodSources.find(fs => fs.id === id);
+                        if (foodSource && foodSource.energyUnit === 'kcalcup' && parseFloat(energyInput.value) > 0) {
+                            const unitSelect = this.container.querySelector('#unit');
+                            const cupsButton = this.container.querySelector('#cupsButton');
+                            
+                            // First check if cups button will be enabled after update
+                            const willEnableCups = this.foodSources.some(fs => 
+                                fs.energyUnit === 'kcalcup' && fs.energy && parseFloat(fs.energy) > 0
+                            );
+                            
+                            if (willEnableCups && unitSelect) {
+                                // Set cups BEFORE updating calculations
+                                unitSelect.value = 'cups';
+                                unitSelect.setAttribute('value', 'cups');
+                                this.setActiveUnitButton('cups');
+                                
+                                // Enable the cups button manually since we know it will be valid
+                                if (cupsButton) {
+                                    cupsButton.disabled = false;
+                                    cupsButton.title = 'Show amounts in cups';
+                                }
+                            }
+                            
+                            // Now update calculations with cups already selected
+                            this.updateFoodCalculations();
+                        } else {
+                            this.updateFoodCalculations();
+                        }
                     });
                     energyInput.addEventListener('blur', () => this.validateFoodSourceEnergy(id));
                 }
@@ -2670,7 +2945,54 @@ const CALCULATOR_CONFIG = {
                 if (energyUnitSelect) {
                     energyUnitSelect.addEventListener('change', () => {
                         this.updateFoodSourceData(id, 'energyUnit', energyUnitSelect.value);
-                        this.updateFoodCalculations();
+                        
+                        // Auto-select the most appropriate unit based on energy unit
+                        const unitSelect = this.container.querySelector('#unit');
+                        const energyInput = document.getElementById(`energy-${id}`);
+                        
+                        if (unitSelect) {
+                            switch(energyUnitSelect.value) {
+                                case 'kcalcup':
+                                    // Check if we have energy value to enable cups
+                                    const foodSource = this.foodSources.find(fs => fs.id === id);
+                                    if (foodSource && foodSource.energy && parseFloat(foodSource.energy) > 0) {
+                                        // Set cups BEFORE updating calculations
+                                        unitSelect.value = 'cups';
+                                        unitSelect.setAttribute('value', 'cups');
+                                        this.setActiveUnitButton('cups');
+                                        
+                                        // Enable the cups button manually
+                                        const cupsButton = this.container.querySelector('#cupsButton');
+                                        if (cupsButton) {
+                                            cupsButton.disabled = false;
+                                            cupsButton.title = 'Show amounts in cups';
+                                        }
+                                    }
+                                    this.updateFoodCalculations();
+                                    break;
+                                case 'kcal100g':
+                                    // For kcal/100g, select grams
+                                    unitSelect.value = 'g';
+                                    this.setActiveUnitButton('g');
+                                    this.updateFoodCalculations();
+                                    break;
+                                case 'kcalkg':
+                                    // For kcal/kg, also select grams (or could be kg)
+                                    unitSelect.value = 'g';
+                                    this.setActiveUnitButton('g');
+                                    this.updateFoodCalculations();
+                                    break;
+                                case 'kcalcan':
+                                    // For kcal/can, use grams as default (or ounces in imperial)
+                                    unitSelect.value = this.isImperial ? 'oz' : 'g';
+                                    this.setActiveUnitButton(unitSelect.value);
+                                    this.updateFoodCalculations();
+                                    break;
+                            }
+                        } else {
+                            // No unit select, just update calculations
+                            this.updateFoodCalculations();
+                        }
                     });
                 }
 
@@ -2840,6 +3162,58 @@ const CALCULATOR_CONFIG = {
 
                 if (addFoodBtn) addFoodBtn.addEventListener('click', () => this.addFoodSource());
 
+                // Feeding configuration event listeners
+                const showDaily = this.container.querySelector('#showDaily');
+                const showPerMeal = this.container.querySelector('#showPerMeal');
+                const mealsPerDayInput = this.container.querySelector('#mealsPerDay');
+                const mealInputGroup = this.container.querySelector('#mealInputGroup');
+
+                if (showDaily) {
+                    showDaily.addEventListener('change', () => {
+                        if (showDaily.checked) {
+                            this.showPerMeal = false;
+                            if (mealInputGroup) mealInputGroup.style.display = 'none';
+                            this.updateDayLabel();
+                            this.updateFoodCalculations();
+                        }
+                    });
+                }
+
+                if (showPerMeal) {
+                    showPerMeal.addEventListener('change', () => {
+                        if (showPerMeal.checked) {
+                            this.showPerMeal = true;
+                            if (mealInputGroup) mealInputGroup.style.display = 'inline-flex';
+                            this.updateDayLabel();
+                            this.updateFoodCalculations();
+                        }
+                    });
+                }
+
+                if (mealsPerDayInput) {
+                    mealsPerDayInput.addEventListener('input', () => {
+                        const meals = parseInt(mealsPerDayInput.value);
+                        if (meals && meals >= 1 && meals <= 10) {
+                            this.mealsPerDay = meals;
+                            if (this.showPerMeal) {
+                                this.updateDayLabel();
+                                this.updateFoodCalculations();
+                            }
+                        }
+                    });
+
+                    mealsPerDayInput.addEventListener('blur', () => {
+                        if (!mealsPerDayInput.value || parseInt(mealsPerDayInput.value) < 1) {
+                            mealsPerDayInput.value = 2;
+                            this.mealsPerDay = 2;
+                            if (this.showPerMeal) {
+                                this.updateDayLabel();
+                                this.updateFoodCalculations();
+                            }
+                        }
+                    });
+                }
+
                 // Modal event listeners
                 const shareBtn = this.container.querySelector('#shareBtn');
                 const embedBtn = this.container.querySelector('#embedBtn');
@@ -3016,7 +3390,7 @@ const CALCULATOR_CONFIG = {
                 }
             }
 
-            convertUnits(grams, unit) {
+            convertUnits(grams, unit, foodSource = null) {
                 switch (unit) {
                     case 'kg':
                         return grams / 1000;
@@ -3024,6 +3398,18 @@ const CALCULATOR_CONFIG = {
                         return grams / 28.3495;
                     case 'lb':
                         return grams / 453.592;
+                    case 'cups':
+                        // For cups, we need to convert from grams worth of calories to cups
+                        if (foodSource && foodSource.energyUnit === 'kcalcup' && foodSource.energy) {
+                            // Get calories per 100g for this food
+                            const caloriesPerGram = this.getFoodSourceEnergyPer100g(foodSource) / 100;
+                            // Calculate total calories represented by these grams
+                            const totalCalories = grams * caloriesPerGram;
+                            // Divide by calories per cup to get number of cups
+                            const caloriesPerCup = parseFloat(foodSource.energy);
+                            return totalCalories / caloriesPerCup;
+                        }
+                        return null; // Cannot convert to cups without kcal/cup
                     default:
                         return grams;
                 }
@@ -3058,10 +3444,21 @@ const CALCULATOR_CONFIG = {
             updateDayLabel() {
                 const days = this.container.querySelector('#days')?.value;
                 const dayLabel = this.container.querySelector('#dayLabel');
+                const mealNote = this.container.querySelector('#mealNote');
                 if (dayLabel && days) {
                     const numDays = parseInt(days);
                     dayLabel.textContent = numDays === 1 ? 'day' : 'days';
                 }
+                if (mealNote) {
+                    if (this.showPerMeal && days) {
+                        const numDays = parseInt(days);
+                        const totalMeals = numDays * this.mealsPerDay;
+                        mealNote.textContent = ` (${totalMeals} meal${totalMeals === 1 ? '' : 's'} total)`;
+                        mealNote.style.display = 'inline';
+                    } else {
+                        mealNote.style.display = 'none';
+                    }
+                }
             }
 
             setActiveUnitButton(unit) {
@@ -3116,6 +3513,31 @@ const CALCULATOR_CONFIG = {
                 this.sendHeightToParent();
             }
 
+            updateCupsButtonState() {
+                const cupsButton = this.container.querySelector('#cupsButton');
+                if (!cupsButton) return;
+                
+                // Check if any food source has kcal/cup selected
+                const hasKcalCup = this.foodSources.some(fs => 
+                    fs.energyUnit === 'kcalcup' && fs.energy && parseFloat(fs.energy) > 0
+                );
+                
+                if (hasKcalCup) {
+                    cupsButton.disabled = false;
+                    cupsButton.title = 'Show amounts in cups';
+                } else {
+                    cupsButton.disabled = true;
+                    cupsButton.title = 'Available when using kcal/cup measurement';
+                    
+                    // If cups was selected, switch back to grams
+                    const unitSelect = this.container.querySelector('#unit');
+                    if (unitSelect && unitSelect.value === 'cups') {
+                        unitSelect.value = 'g';
+                        this.setActiveUnitButton('g');
+                    }
+                }
+            }
+
             updateFoodCalculations() {
                 if (this.currentMER === 0) return;
                 
@@ -3128,15 +3550,36 @@ const CALCULATOR_CONFIG = {
                 const totalAmountDisplay = this.container.querySelector('#totalAmountDisplay');
                 const foodBreakdownResults = this.container.querySelector('#foodBreakdownResults');
                 const foodBreakdownList = this.container.querySelector('#foodBreakdownList');
+                const feedingConfig = this.container.querySelector('#feedingConfig');
+                
+                // Update cups button state
+                this.updateCupsButtonState();
 
                 if (!daysInput || !unitSelect || !dailyFoodResults || !dailyFoodValue || !foodAmountsSection) {
                     return;
                 }
 
                 const days = daysInput.value;
-                const unit = unitSelect.value;
+                let unit = unitSelect.value;
-                const unitLabel = unit === 'g' ? 'g' : unit === 'kg' ? 'kg' : unit === 'oz' ? 'oz' : 'lb';
+                
-                const decimals = unit === 'g' ? 0 : unit === 'kg' ? 2 : 1;
+                // Failsafe: if unit is empty string but cups button is active, use 'cups'
+                if (!unit || unit === '') {
+                    const activeButton = this.container.querySelector('.dog-calculator-unit-btn.active');
+                    if (activeButton) {
+                        unit = activeButton.dataset.unit || 'g';
+                    } else {
+                        unit = 'g'; // Default fallback
+                    }
+                }
+                
+                const unitLabel = unit === 'g' ? 'g' : unit === 'kg' ? 'kg' : unit === 'oz' ? 'oz' : unit === 'lb' ? 'lb' : 'cups';
+                const decimals = unit === 'g' ? 0 : unit === 'kg' ? 2 : unit === 'cups' ? 1 : 1;
+                
+                // Debug: log what unit is being used
+                console.log('UpdateFoodCalculations - unit:', unit, 'unitLabel:', unitLabel);
+                
+                // Determine frequency suffix for display
+                const frequencySuffix = this.showPerMeal ? '/meal' : '/day';
                 
                 // Clear all food source errors first
                 this.foodSources.forEach(fs => {
@@ -3150,6 +3593,7 @@ const CALCULATOR_CONFIG = {
                     foodAmountsSection.style.display = 'none';
                     dailyFoodResults.style.display = 'none';
                     if (foodBreakdownResults) foodBreakdownResults.style.display = 'none';
+                    if (feedingConfig) feedingConfig.style.display = 'none';
                     
                     // Hide unit buttons when validation fails
                     const unitButtons = this.container.querySelector('#unitButtons');
@@ -3169,15 +3613,44 @@ const CALCULATOR_CONFIG = {
                     
                     if (energyPer100g && energyPer100g > 0.1 && fs.percentage > 0) {
                         const dailyCaloriesForThisFood = (this.currentMER * fs.percentage) / 100;
-                        const dailyGramsForThisFood = (dailyCaloriesForThisFood / energyPer100g) * 100;
+                        let dailyGramsForThisFood;
+                        let dailyCupsForThisFood = null;
+                        
+                        // For kcal/cup, calculate cups directly from calories
+                        if (fs.energyUnit === 'kcalcup' && fs.energy) {
+                            const caloriesPerCup = parseFloat(fs.energy);
+                            dailyCupsForThisFood = dailyCaloriesForThisFood / caloriesPerCup;
+                            // We still need grams for total calculation, use approximation
+                            dailyGramsForThisFood = (dailyCaloriesForThisFood / energyPer100g) * 100;
+                            console.log('Cups calculation:', {
+                                caloriesPerCup,
+                                dailyCaloriesForThisFood,
+                                dailyCupsForThisFood,
+                                dailyGramsForThisFood
+                            });
+                        } else {
+                            // For other units, calculate grams normally
+                            dailyGramsForThisFood = (dailyCaloriesForThisFood / energyPer100g) * 100;
+                        }
+                        
+                        // Calculate per-meal amounts if needed
+                        const displayGrams = this.showPerMeal ? dailyGramsForThisFood / this.mealsPerDay : dailyGramsForThisFood;
+                        const displayCups = dailyCupsForThisFood !== null ? 
+                            (this.showPerMeal ? dailyCupsForThisFood / this.mealsPerDay : dailyCupsForThisFood) : null;
+                        const displayCalories = this.showPerMeal ? dailyCaloriesForThisFood / this.mealsPerDay : dailyCaloriesForThisFood;
                         
                         foodBreakdowns.push({
                             name: fs.name,
                             percentage: fs.percentage,
                             dailyGrams: dailyGramsForThisFood,
+                            displayGrams: displayGrams,
+                            dailyCups: dailyCupsForThisFood,
+                            displayCups: displayCups,
                             calories: dailyCaloriesForThisFood,
+                            displayCalories: displayCalories,
                             isLocked: fs.isLocked,
-                            hasEnergyContent: true
+                            hasEnergyContent: true,
+                            foodSource: fs  // Store reference for cups conversion
                         });
                         
                         totalDailyGrams += dailyGramsForThisFood;
@@ -3188,9 +3661,14 @@ const CALCULATOR_CONFIG = {
                             name: fs.name,
                             percentage: fs.percentage,
                             dailyGrams: 0,
+                            displayGrams: 0,
+                            dailyCups: null,
+                            displayCups: null,
                             calories: 0,
+                            displayCalories: 0,
                             isLocked: fs.isLocked,
-                            hasEnergyContent: false
+                            hasEnergyContent: false,
+                            foodSource: fs  // Store reference for cups conversion
                         });
                     }
                 });
@@ -3206,6 +3684,7 @@ const CALCULATOR_CONFIG = {
                     
                     dailyFoodResults.style.display = 'none';
                     if (foodBreakdownResults) foodBreakdownResults.style.display = 'none';
+                    if (feedingConfig) feedingConfig.style.display = 'none';
                     
                     // Hide unit buttons when no valid foods
                     const unitButtons = this.container.querySelector('#unitButtons');
@@ -3252,6 +3731,17 @@ const CALCULATOR_CONFIG = {
                 // Update daily food results (total) - will be updated with proper units later
                 dailyFoodResults.style.display = 'block';
                 
+                // Show feeding configuration when we have valid foods
+                if (feedingConfig) {
+                    feedingConfig.style.display = 'block';
+                    
+                    // Ensure "Per day" is checked when feeding config becomes visible
+                    const showDaily = this.container.querySelector('#showDaily');
+                    if (showDaily && !showDaily.checked && !this.container.querySelector('#showPerMeal').checked) {
+                        showDaily.checked = true;
+                    }
+                }
+                
                 // Show unit buttons when daily results are shown
                 const unitButtons = this.container.querySelector('#unitButtons');
                 if (unitButtons) unitButtons.style.display = 'flex';
@@ -3259,9 +3749,21 @@ const CALCULATOR_CONFIG = {
                 // Update per-food breakdown
                 if (foodBreakdownList && foodBreakdowns.length > 1) {
                     const breakdownHTML = foodBreakdowns.map(breakdown => {
-                        const valueContent = breakdown.hasEnergyContent 
+                        let valueContent;
-                            ? `${this.formatNumber(this.convertUnits(breakdown.dailyGrams, unit), decimals)} ${unitLabel}/day`
+                        if (breakdown.hasEnergyContent) {
-                            : `<span class="dog-calculator-warning" title="Enter energy content to calculate amount">⚠️</span>`;
+                            if (unit === 'cups') {
+                                // For cups, use the pre-calculated cups value if available
+                                if (breakdown.displayCups !== null) {
+                                    valueContent = `${this.formatNumber(breakdown.displayCups, decimals)} ${unitLabel}${frequencySuffix}`;
+                                } else {
+                                    valueContent = `<span class="dog-calculator-warning" title="Cups only available for foods with kcal/cup measurement">N/A</span>`;
+                                }
+                            } else {
+                                valueContent = `${this.formatNumber(this.convertUnits(breakdown.displayGrams, unit), decimals)} ${unitLabel}${frequencySuffix}`;
+                            }
+                        } else {
+                            valueContent = `<span class="dog-calculator-warning" title="Enter energy content to calculate amount">⚠️</span>`;
+                        }
                         
                         return `
                             <div class="dog-calculator-food-result-item">
@@ -3280,8 +3782,41 @@ const CALCULATOR_CONFIG = {
                 // Generate individual food amount breakdown
                 
                 // Update daily food value with correct units
-                const convertedDailyTotal = this.convertUnits(totalDailyGrams, unit);
+                const displayTotal = this.showPerMeal ? totalDailyGrams / this.mealsPerDay : totalDailyGrams;
-                dailyFoodValue.textContent = this.formatNumber(convertedDailyTotal, decimals) + ` ${unitLabel}/day`;
+                let convertedTotal;
+                let totalDisplayText;
+                
+                if (unit === 'cups') {
+                    console.log('Unit is cups, checking validity...');
+                    // For cups, we can only show total if all foods with percentage > 0 have kcal/cup
+                    const validForCups = foodBreakdowns.filter(b => b.percentage > 0)
+                        .every(b => b.displayCups !== null && b.displayCups !== undefined);
+                    
+                    console.log('Valid for cups?', validForCups, 'Breakdowns:', foodBreakdowns);
+                    
+                    if (validForCups) {
+                        // Calculate total cups using pre-calculated values
+                        let totalCups = 0;
+                        foodBreakdowns.forEach(breakdown => {
+                            if (breakdown.percentage > 0 && breakdown.displayCups !== null) {
+                                totalCups += breakdown.displayCups;
+                            }
+                        });
+                        console.log('Total cups display:', {
+                            totalCups,
+                            displayTotal,
+                            foodBreakdowns: foodBreakdowns.map(b => ({ name: b.name, displayCups: b.displayCups }))
+                        });
+                        totalDisplayText = this.formatNumber(totalCups, decimals) + ` ${unitLabel}${frequencySuffix}`;
+                    } else {
+                        totalDisplayText = 'Mixed units - see breakdown';
+                    }
+                } else {
+                    convertedTotal = this.convertUnits(displayTotal, unit);
+                    totalDisplayText = this.formatNumber(convertedTotal, decimals) + ` ${unitLabel}${frequencySuffix}`;
+                }
+                
+                dailyFoodValue.textContent = totalDisplayText;
                 
                 // Build HTML for individual food amounts
                 const foodAmountsHTML = foodBreakdowns.map(breakdown => {
@@ -3302,8 +3837,24 @@ const CALCULATOR_CONFIG = {
                             </div>
                         `;
                     } else {
-                        const totalGramsForDays = breakdown.dailyGrams * numDays;
+                        // For multi-day calculations: show total amount for all days
-                        const convertedAmount = this.convertUnits(totalGramsForDays, unit);
+                        let amountDisplay;
+                        if (unit === 'cups') {
+                            // For cups, use pre-calculated cups value
+                            if (breakdown.dailyCups !== null) {
+                                const totalCupsForDays = breakdown.dailyCups * numDays;
+                                amountDisplay = `${this.formatNumber(totalCupsForDays, decimals)} ${unitLabel}`;
+                            } else {
+                                amountDisplay = `<span class="dog-calculator-warning" title="Cups only available for foods with kcal/cup measurement">N/A</span>`;
+                            }
+                        } else {
+                            // For other units, calculate from grams
+                            const totalGramsForDays = this.showPerMeal 
+                                ? (breakdown.dailyGrams / this.mealsPerDay) * numDays * this.mealsPerDay
+                                : breakdown.dailyGrams * numDays;
+                            const convertedAmount = this.convertUnits(totalGramsForDays, unit);
+                            amountDisplay = `${this.formatNumber(convertedAmount, decimals)} ${unitLabel}`;
+                        }
                         
                         return `
                             <div class="dog-calculator-food-amount-item">
@@ -3313,7 +3864,7 @@ const CALCULATOR_CONFIG = {
                                     ${lockIndicator}
                                 </div>
                                 <div class="dog-calculator-food-amount-value">
-                                    ${this.formatNumber(convertedAmount, decimals)} ${unitLabel}
+                                    ${amountDisplay}
                                 </div>
                             </div>
                         `;
@@ -3322,7 +3873,6 @@ const CALCULATOR_CONFIG = {
                 
                 // Calculate and display total
                 const totalFoodGrams = totalDailyGrams * numDays;
-                const totalConverted = this.convertUnits(totalFoodGrams, unit);
                 
                 // Update the display
                 if (foodAmountsList) {
@@ -3330,7 +3880,27 @@ const CALCULATOR_CONFIG = {
                 }
                 
                 if (totalAmountDisplay) {
-                    totalAmountDisplay.textContent = `${this.formatNumber(totalConverted, decimals)} ${unitLabel}`;
+                    if (unit === 'cups') {
+                        // For cups total, check if all foods can be converted
+                        const validForCups = foodBreakdowns.filter(b => b.percentage > 0)
+                            .every(b => b.dailyCups !== null && b.dailyCups !== undefined);
+                        
+                        if (validForCups) {
+                            // Calculate total cups using pre-calculated values
+                            let totalCups = 0;
+                            foodBreakdowns.forEach(breakdown => {
+                                if (breakdown.percentage > 0 && breakdown.dailyCups !== null) {
+                                    totalCups += breakdown.dailyCups * numDays;
+                                }
+                            });
+                            totalAmountDisplay.textContent = `${this.formatNumber(totalCups, decimals)} ${unitLabel}`;
+                        } else {
+                            totalAmountDisplay.textContent = 'Mixed units - see individual amounts';
+                        }
+                    } else {
+                        const totalConverted = this.convertUnits(totalFoodGrams, unit);
+                        totalAmountDisplay.textContent = `${this.formatNumber(totalConverted, decimals)} ${unitLabel}`;
+                    }
                 }
                 
                 foodAmountsSection.style.display = 'block';