Enhance pump status determination for modbus and relay-based pumps

Author: celestinjr

scripts/pumps.js

@@ -100,8 +100,24 @@
                     el.css({ display: '' });
                     if (data.pumpOnDelay === true)
                         el.find('div.picIndicator').attr('data-status', 'delay');
-                    else
-                        el.find('div.picIndicator').attr('data-status', data.command === 10 || data.relay > 0 ? 'on' : 'off');
+                    else {
+                        // Determine pump on/off status based on pump type
+                        var isOn = false;
+                        if (type.name === 'regalmodbus' || type.name === 'regalmodbus2') {
+                            // For modbus pumps, use actual speed/flow indicators
+                            // Pump is considered "on" if it's actually running at a speed > 0
+                            isOn = (typeof data.rpm !== 'undefined' && data.rpm > 0) || 
+                                   (typeof data.speed !== 'undefined' && data.speed > 0);
+                            if (data.id === 1) {  // Debug for pump 1 only to avoid spam
+                                console.debug(`[Pump ${data.id}] Modbus pump state - rpm: ${data.rpm}, speed: ${data.speed}, isOn: ${isOn}`);
+                            }
+                        }
+                        else {
+                            // For relay-based pumps, use command or relay status
+                            isOn = data.command === 10 || data.relay > 0;
+                        }
+                        el.find('div.picIndicator').attr('data-status', isOn ? 'on' : 'off');
+                    }
                 }
                 el.attr('data-pumptype', data.type.val);
                 el.attr('data-id', data.id);