nodejs-poolcontroller 7.3.1 → 7.6.1

package/controller/comms/messages/config/ExternalMessage.ts

@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { Inbound } from "../Messages";
 import { sys, Body, ICircuitGroup, LightGroup, CircuitGroup } from "../../../Equipment";
 import { state, ICircuitGroupState, LightGroupState } from "../../../State";
-import { utils } from "../../../Constants";
+import { Timestamp, utils } from "../../../Constants";
 import { logger } from "../../../../logger/Logger";
 export class ExternalMessage {
     public static processIntelliCenter(msg: Inbound): void {
@@ -83,7 +83,8 @@ export class ExternalMessage {
         if (isActive) {
             let chem = sys.chemControllers.getItemById(id, true);
             let schem = state.chemControllers.getItemById(id, true);
-            chem.isVirtual = false;
+            // chem.isVirtual = false;
+            chem.master = 0;
             chem.ph.tank.capacity = chem.orp.tank.capacity = 6;
             chem.ph.tank.units = chem.orp.tank.units = '';
             schem.type = chem.type = 2;
@@ -106,7 +107,8 @@ export class ExternalMessage {
         let valve = sys.valves.getItemById(msg.extractPayloadByte(2) + 1);
         valve.circuit = msg.extractPayloadByte(3) + 1;
         valve.name = msg.extractPayloadString(4, 16);
-        valve.isVirtual = false;
+        valve.master = 0;
+        // valve.isVirtual = false;
         msg.isProcessed = true;
     }
     public static processPool(msg: Inbound) {
@@ -215,7 +217,7 @@ export class ExternalMessage {
                     if (group.isActive) {
                         for (let i = 0; i < 16; i++) {
                             let circuitId = msg.extractPayloadByte(i + 6);
-                            let circuit = group.circuits.getItemById(i + 1, circuitId !== 255);
+                            let circuit = group.circuits.getItemById(i + 1, circuitId < 255);
                             if (circuitId === 255) group.circuits.removeItemById(i + 1);
                             circuit.circuit = circuitId + 1;
 
@@ -272,31 +274,30 @@ export class ExternalMessage {
     private static processHeater(msg: Inbound) {
         // So a user is changing the heater info.  Lets
         // hijack it and get it ourselves.
-        let heater = sys.heaters.getItemById(msg.extractPayloadByte(2) + 1);
-        heater.type = msg.extractPayloadByte(3);
-        heater.body = msg.extractPayloadByte(4);
-        heater.cooldownDelay = msg.extractPayloadByte(5);
-        heater.startTempDelta = msg.extractPayloadByte(6);
-        heater.stopTempDelta = msg.extractPayloadByte(7);
-        heater.coolingEnabled = msg.extractPayloadByte(8) > 0;
-        heater.differentialTemp = msg.extractPayloadByte(9);
-        heater.address = msg.extractPayloadByte(10);
-        heater.name = msg.extractPayloadString(11, 16);
-        heater.efficiencyMode = msg.extractPayloadByte(27);
-        heater.maxBoostTemp = msg.extractPayloadByte(28);
-        heater.economyTime = msg.extractPayloadByte(29);
-        if (heater.type === 0) {
-            sys.heaters.removeItemById(heater.id);
-            state.heaters.removeItemById(heater.id);
+        let isActive = msg.extractPayloadByte(3) !== 0;
+        let heaterId = msg.extractPayloadByte(2) + 1;
+        if (isActive) {
+            let heater = sys.heaters.getItemById(heaterId, true);
+            let hstate = state.heaters.getItemById(heater.id, true);
+
+            hstate.type = heater.type = msg.extractPayloadByte(3);
+            heater.body = msg.extractPayloadByte(4);
+            heater.cooldownDelay = msg.extractPayloadByte(5);
+            heater.startTempDelta = msg.extractPayloadByte(6);
+            heater.stopTempDelta = msg.extractPayloadByte(7);
+            heater.coolingEnabled = msg.extractPayloadByte(8) > 0;
+            heater.differentialTemp = msg.extractPayloadByte(9);
+            heater.address = msg.extractPayloadByte(10);
+            hstate.name = heater.name = msg.extractPayloadString(11, 16);
+            heater.efficiencyMode = msg.extractPayloadByte(27);
+            heater.maxBoostTemp = msg.extractPayloadByte(28);
+            heater.economyTime = msg.extractPayloadByte(29);
+            heater.master = 0;
         }
         else {
-            let hstate = state.heaters.getItemById(heater.id, true);
-            hstate.name = heater.name;
-            //heater.isVirtual = hstate.isVirtual = false;
-            hstate.name = heater.name;
-            hstate.type = heater.type;
+            sys.heaters.removeItemById(heaterId);
+            state.heaters.removeItemById(heaterId);
         }
-
         sys.board.heaters.updateHeaterServices();
         // Check anyway to make sure we got it all.
         //setTimeout(() => sys.checkConfiguration(), 500);
@@ -428,13 +429,13 @@ export class ExternalMessage {
                         // [11] = No sequencing underway.
                         switch (byte) {
                             case 0: // Sync
-                                lg.action = 1;
+                                lg.action = sys.board.valueMaps.circuitActions.getValue('colorsync');
                                 break;
                             case 1: // Color swim
-                                lg.action = 3;
+                                lg.action = sys.board.valueMaps.circuitActions.getValue('colorswim');
                                 break;
                             case 2: // Color set
-                                lg.action = 2;
+                                lg.action = sys.board.valueMaps.circuitActions.getValue('colorset');
                                 break;
                             default:
                                 lg.action = 0;
@@ -499,11 +500,14 @@ export class ExternalMessage {
         let startTime = msg.extractPayloadInt(3);
         let endTime = msg.extractPayloadInt(5);
         let circuit = msg.extractPayloadByte(7) + 1;
-        let cfg = sys.schedules.getItemById(schedId, circuit !== 256 && startTime !== 0 && endTime !== 0);
-        cfg.isActive = (circuit !== 256 && startTime !== 0 && endTime !== 0);
+        let isActive = (msg.extractPayloadByte(8) & 128) === 128; // Inactive schedules do not have bit 8 set.
+        let cfg = sys.schedules.getItemById(schedId, isActive);
+        let s = state.schedules.getItemById(schedId, cfg.isActive);
+        //cfg.isActive = (circuit !== 256);
         cfg.startTime = startTime;
         cfg.endTime = endTime;
         cfg.circuit = circuit;
+        cfg.isActive = isActive;
         let byte = msg.extractPayloadByte(8);
         cfg.scheduleType = (byte & 1 & 0xFF) === 1 ? 0 : 128;
         if ((byte & 4 & 0xFF) === 4) cfg.startTimeType = 1;
@@ -524,7 +528,6 @@ export class ExternalMessage {
         cfg.heatSource = hs;
         cfg.heatSetpoint = msg.extractPayloadByte(14);
         cfg.coolSetpoint = msg.extractPayloadByte(15);
-        let s = state.schedules.getItemById(schedId, cfg.isActive);
         if (cfg.isActive) {
             let s = state.schedules.getItemById(schedId, cfg.isActive);
             s.isActive = cfg.isActive = true;
@@ -738,6 +741,8 @@ export class ExternalMessage {
                 sys.general.options.clockMode = (msg.extractPayloadByte(14) & 0x0001) == 1 ? 24 : 12;
                 msg.isProcessed = true;
                 break;
+            case 12: // This is byte 15 but we don't know what it is.  Numbers witnessed include 51, 52, 89, 235.
+                break;
             case 14: // Clock source
                 if ((msg.extractPayloadByte(17) & 0x0040) === 1)
                     sys.general.options.clockSource = 'internet';
@@ -745,6 +750,8 @@ export class ExternalMessage {
                     sys.general.options.clockSource = 'manual';
                 msg.isProcessed = true;
                 break;
+            case 15: // This is byte 18 but we don't know what it is.  Numbers witnessed include 1, 2, 3, 5, 100.
+                break;
             case 18: // Body 1 Heat Setpoint
                 body = sys.bodies.getItemById(1, false);
                 body.heatSetpoint = msg.extractPayloadByte(21);
@@ -768,7 +775,7 @@ export class ExternalMessage {
                 break;
             case 21: // Body 2 Cool Setpoint
                 body = sys.bodies.getItemById(2, false);
-                body.setPoint = msg.extractPayloadByte(24);
+                body.coolSetpoint = msg.extractPayloadByte(24);
                 state.temps.bodies.getItemById(2).coolSetpoint = body.coolSetpoint;
                 state.emitEquipmentChanges();
                 msg.isProcessed = true;
@@ -817,6 +824,19 @@ export class ExternalMessage {
                 sys.general.options.manualHeat = msg.extractPayloadByte(40) !== 0;
                 msg.isProcessed = true;
                 break;
+            case 64: // Vacation mode
+                let yy = msg.extractPayloadByte(5) + 2000;
+                let mm = msg.extractPayloadByte(6);
+                let dd = msg.extractPayloadByte(7);
+                sys.general.options.vacation.startDate = new Date(yy, mm - 1, dd);
+                yy = msg.extractPayloadByte(8) + 2000;
+                mm = msg.extractPayloadByte(9);
+                dd = msg.extractPayloadByte(10);
+                sys.general.options.vacation.endDate = new Date(yy, mm - 1, dd);
+                sys.general.options.vacation.enabled = msg.extractPayloadByte(3) > 0;
+                sys.general.options.vacation.useTimeframe = msg.extractPayloadByte(4) > 0;
+                msg.isProcessed = true;
+                break;
         }
     }
     public static processTouchChlorinator(msg: Inbound) {

package/controller/comms/messages/config/FeatureMessage.ts

@@ -58,6 +58,7 @@ export class FeatureMessage {
                 FeatureMessage.processFeatureNames(msg);
                 break;
             case 22: // Not sure what this is.
+                msg.isProcessed = true;
                 break;
             default:
                 logger.debug(`Unprocessed Config Message ${msg.toPacket()}`)
@@ -70,6 +71,7 @@ export class FeatureMessage {
             var feature: Feature = sys.features.getItemById(featureId, false);
             feature.dontStop = msg.extractPayloadByte(i + 1) == 1;
         }
+        msg.isProcessed = true;
     }
     private static processFeatureType(msg: Inbound) {
         for (let i = 1; i < msg.payload.length - 1 && i <= sys.equipment.maxFeatures; i++) {
@@ -88,6 +90,7 @@ export class FeatureMessage {
                 state.features.removeItemById(featureId);
             }
         }
+        msg.isProcessed = true;
     }
     private static processFreezeProtect(msg: Inbound) {
         for (let i = 1; i < msg.payload.length - 1 && i <= sys.equipment.maxFeatures; i++) {
@@ -95,6 +98,7 @@ export class FeatureMessage {
             var feature: Feature = sys.features.getItemById(featureId);
             feature.freeze = msg.extractPayloadByte(i + 1) > 0;
         }
+        msg.isProcessed = true;
     }
     private static processFeatureNames(msg: Inbound) {
         var featureId = ((msg.extractPayloadByte(1) - 6) * 2) + sys.board.equipmentIds.features.start;
@@ -109,6 +113,7 @@ export class FeatureMessage {
             if (feature.isActive) state.features.getItemById(feature.id).name = feature.name;
         }
         state.emitEquipmentChanges();
+        msg.isProcessed = true;
     }
     private static processEggTimerHours(msg: Inbound) {
         for (let i = 1; i < msg.payload.length - 1 && i <= sys.equipment.maxFeatures; i++) {
@@ -116,6 +121,7 @@ export class FeatureMessage {
             let feature: Feature = sys.features.getItemById(featureId);
             feature.eggTimer = (msg.extractPayloadByte(i + 1) * 60) + ((feature.eggTimer || 0) % 60);
         }
+        msg.isProcessed = true;
     }
     private static processEggTimerMinutes(msg: Inbound) {
         for (let i = 1; i < msg.payload.length - 1 && i <= sys.equipment.maxFeatures; i++) {
@@ -123,6 +129,7 @@ export class FeatureMessage {
             var feature: Feature = sys.features.getItemById(featureId);
             feature.eggTimer = (Math.floor(feature.eggTimer / 60) * 60) + msg.extractPayloadByte(i + 1);
         }
+        msg.isProcessed = true;
     }
     private static processShowInFeatures(msg: Inbound) {
         for (let i = 1; i < msg.payload.length - 1 && i <= sys.equipment.maxFeatures; i++) {
@@ -132,6 +139,6 @@ export class FeatureMessage {
             if (feature.isActive) state.features.getItemById(featureId, feature.isActive).showInFeatures = feature.showInFeatures;
         }
         state.emitEquipmentChanges();
+        msg.isProcessed = true;
     }
-
 }

package/controller/comms/messages/config/GeneralMessage.ts

@@ -24,31 +24,39 @@ export class GeneralMessage {
                 sys.general.alias = msg.extractPayloadString(2, 16);
                 sys.general.owner.name = msg.extractPayloadString(18, 16);
                 sys.general.location.zip = msg.extractPayloadString(34, 6);
+                msg.isProcessed = true;
                 break;
             case 1:
                 sys.general.owner.phone = msg.extractPayloadString(2, 20);
                 sys.general.owner.phone2 = msg.extractPayloadString(21, 15);
                 sys.general.location.latitude = ((msg.extractPayloadByte(35) * 256) + msg.extractPayloadByte(34)) / 100;
+                msg.isProcessed = true;
                 break;
             case 2:
                 sys.general.location.address = msg.extractPayloadString(2, 32);
                 sys.general.location.longitude = -(((msg.extractPayloadByte(35) * 256) + msg.extractPayloadByte(34)) / 100);
+                msg.isProcessed = true;
                 break;
             case 3:
                 sys.general.owner.email = msg.extractPayloadString(2, 32);
                 sys.general.location.timeZone = msg.extractPayloadByte(34);
+                msg.isProcessed = true;
                 break;
             case 4:
                 sys.general.owner.email2 = msg.extractPayloadString(2, 32);
+                msg.isProcessed = true;
                 break;
             case 5:
                 sys.general.location.country = msg.extractPayloadString(2, 32);
+                msg.isProcessed = true;
                 break;
             case 6:
                 sys.general.location.city = msg.extractPayloadString(2, 32);
+                msg.isProcessed = true;
                 break;
             case 7:
                 sys.general.location.state = msg.extractPayloadString(2, 32);
+                msg.isProcessed = true;
                 break;
             default:
                 logger.debug(`Unprocessed Config Message ${msg.toPacket()}`)

package/controller/comms/messages/config/HeaterMessage.ts

@@ -107,6 +107,7 @@ export class HeaterMessage {
                             catch (err) { logger.error(`Error with OCP reclaiming control over gas heater: ${err}`) }
                         })();
                     }
+                    heater.master = 0;
                     sys.heaters.getItemById(2).isActive = false;
                     sys.heaters.getItemById(3).isActive = false;
                     sys.heaters.getItemById(4).isActive = false;
@@ -133,6 +134,7 @@ export class HeaterMessage {
                             catch (err) { logger.error(`Error with OCP reclaiming control over Ultratemp: ${err}`) }
                         })();
                     }
+                    heatPump.master = 0;
                     heatPump.name = 'Ultratemp';
                     heatPump.body = 32;
                     heatPump.type = 4;
@@ -158,6 +160,7 @@ export class HeaterMessage {
                             catch (err) { logger.error(`Error with OCP reclaiming control over heat pump: ${err}`) }
                         })();
                     }
+                    heatPump.master = 0;
                     heatPump.name = 'Heat Pump';
                     heatPump.body = 32;
                     heatPump.type = 3;
@@ -184,6 +187,7 @@ export class HeaterMessage {
                             catch (err) { logger.error(`Error with OCP reclaiming control over solar heater: ${err}`) }
                         })();
                     }
+                    solar.master = 0;
                     solar.name = 'Solar Heater';
                     solar.type = 2;
                     solar.isActive = true;
@@ -215,34 +219,8 @@ export class HeaterMessage {
                 }
                 sys.board.heaters.syncHeaterStates();
                 sys.equipment.setEquipmentIds();
+                msg.isProcessed = true;
                 break;
-            case 114:
-                // something to do with heat pumps... need equipment or other packets to decipher
-                // [ 255, 0, 255], [165, 0, 112, 16, 114, 10], [144, 2, 0, 0, 0, 0, 0, 0, 0, 0], [2, 51 ]heat + cool
-                // [165,0,112,16,114,10][144,0,0,0,0,0,0,0,0,0][2,49] == no Heater, no cool
-                // [165,0,112,16,114,10][144,2,0,0,0,0,0,0,0,0][2,51] == no heat, cooling
-                // this might be heatStatus not heatMode?
-                break;
-            case 168:
-                {
-                    // IntelliChem Installed
-                    if ((msg.extractPayloadByte(3) & 0x01) === 1) {
-                        // only support for 1 ic with EasyTouch
-                        let chem = sys.chemControllers.getItemByAddress(144, true);
-                        let schem = state.chemControllers.getItemById(chem.id, true);
-                        chem.ph.tank.capacity = chem.orp.tank.capacity = 6;
-                        chem.ph.tank.units = chem.orp.tank.units = '';
-
-                    }
-                    else {
-                        let chem = sys.chemControllers.getItemByAddress(144);
-                        state.chemControllers.removeItemById(chem.id);
-                        sys.chemControllers.removeItemById(chem.id);
-                    }
-                    // Spa Manual Heat on/off
-                    sys.general.options.manualHeat = msg.extractPayloadByte(4) === 1 ? true : false;
-
-                }
         }
     }
     private static processCooldownDelay(msg: Inbound) {
@@ -261,6 +239,7 @@ export class HeaterMessage {
                 })();
             }
         }
+        msg.isProcessed = true;
     }
 
     //private static processBody(msg: Inbound) {
@@ -293,6 +272,7 @@ export class HeaterMessage {
                         catch (err) { logger.error(`Error with OCP reclaiming control over heater: ${err}`) }
                     })();
                 }
+                heater.master = 0;
                 let hstate = state.heaters.getItemById(i);
                 // hstate.isVirtual = false;
                 hstate.name = heater.name;
@@ -300,12 +280,14 @@ export class HeaterMessage {
 
         }
         sys.board.heaters.updateHeaterServices();
+        msg.isProcessed = true;
     }
     private static processMaxBoostTemp(msg: Inbound) {
         for (let i = 0; i < msg.payload.length - 1 && i < sys.equipment.maxHeaters; i++) {
             var heater: Heater = sys.heaters.getItemById(i + 1);
             heater.maxBoostTemp = msg.extractPayloadByte(i + 2);
         }
+        msg.isProcessed = true;
     }
     private static processStartStopDelta(msg: Inbound) {
         for (let i = 1; i < msg.payload.length - 1 && i <= sys.equipment.maxHeaters; i++) {
@@ -313,6 +295,7 @@ export class HeaterMessage {
             heater.startTempDelta = msg.extractPayloadByte(i + 1);
             heater.stopTempDelta = msg.extractPayloadByte(i + 18);
         }
+        msg.isProcessed = true;
     }
     private static processCoolingSetTemp(msg: Inbound) {
         for (let i = 1; i < msg.payload.length - 1 && i <= sys.equipment.maxHeaters; i++) {
@@ -320,20 +303,22 @@ export class HeaterMessage {
             heater.coolingEnabled = msg.extractPayloadByte(i + 1) > 0;
             heater.differentialTemp = msg.extractPayloadByte(i + 18);
         }
+        msg.isProcessed = true;
     }
     private static processAddress(msg: Inbound) {
         for (let i = 1; i < msg.payload.length - 1 && i <= sys.equipment.maxHeaters; i++) {
             var heater: Heater = sys.heaters.getItemById(i);
             heater.address = msg.extractPayloadByte(i + 1);
         }
+        msg.isProcessed = true;
     }
     private static processEfficiencyMode(msg: Inbound) {
         for (let i = 1; i < msg.payload.length - 1 && i <= sys.equipment.maxHeaters; i++) {
             var heater: Heater = sys.heaters.getItemById(i);
             heater.efficiencyMode = msg.extractPayloadByte(i + 1);
         }
+        msg.isProcessed = true;
     }
-
     private static processHeaterNames(msg: Inbound) {
         var heaterId = ((msg.extractPayloadByte(1) - 5) * 2) + 1;
         if (heaterId <= sys.equipment.maxHeaters) {
@@ -344,5 +329,6 @@ export class HeaterMessage {
             let hstate = state.heaters.getItemById(heaterId);
             hstate.name = sys.heaters.getItemById(heaterId++).name = msg.extractPayloadString(18, 16);
         }
+        msg.isProcessed = true;
     }
 }

package/controller/comms/messages/config/IntellichemMessage.ts

@@ -138,7 +138,8 @@ export class IntellichemMessage {
                         let controller = sys.chemControllers.getItemById(id, isActive, { id: i + 1, type: 1 });
                         let scontroller = state.chemControllers.getItemById(controller.id, isActive);
                         scontroller.isActive = controller.isActive = true;
-                        controller.isVirtual = false;
+                        // controller.isVirtual = false;
+                        controller.master = 0;
                         if (!controller.isActive) {
                             sys.chemControllers.removeItemById(controller.id);
                             state.chemControllers.removeItemById(controller.id);
@@ -163,6 +164,7 @@ export class IntellichemMessage {
                         }
                     }
                 }
+                msg.isProcessed = true;
                 break;
             case 1:
                 for (let i = 0; i < 4; i++) {
@@ -175,6 +177,7 @@ export class IntellichemMessage {
                         controller.alkalinity = msg.extractPayloadInt((i * 2) + 26);
                     }
                 }
+                msg.isProcessed = true;
                 break;
         }
     }

package/controller/comms/messages/config/OptionsMessage.ts

@@ -92,9 +92,21 @@ export class OptionsMessage {
                             //body = sys.bodies.getItemById(4, sys.equipment.maxBodies > 3);
                             //body.heatMode = msg.extractPayloadByte(27);
                             //body.heatSetpoint = msg.extractPayloadByte(23);
+                            msg.isProcessed = true;
                             break;
                         }
-                    case 1: // Unknown
+                    case 1: // Vacation mode
+                        let yy = msg.extractPayloadByte(4) + 2000;
+                        let mm = msg.extractPayloadByte(5);
+                        let dd = msg.extractPayloadByte(6);
+                        sys.general.options.vacation.startDate = new Date(yy, mm - 1, dd);
+                        yy = msg.extractPayloadByte(7) + 2000;
+                        mm = msg.extractPayloadByte(8);
+                        dd = msg.extractPayloadByte(9);
+                        sys.general.options.vacation.endDate = new Date(yy, mm - 1, dd);
+                        sys.general.options.vacation.enabled = msg.extractPayloadByte(2) > 0;
+                        sys.general.options.vacation.useTimeframe = msg.extractPayloadByte(3) > 0;
+                        msg.isProcessed = true;
                         break;
                 }
                 msg.isProcessed = true;
@@ -127,6 +139,9 @@ export class OptionsMessage {
                 break;
             }
             case 40:
+            case 168:    
+            {
+
                 // [165,33,16,34,168,10],[0,0,0,254,0,0,0,0,0,0],[2,168 = manual heat mode off
                 // [165,33,16,34,168,10],[0,0,0,254,1,0,0,0,0,0],[2,169] = manual heat mode on
                 sys.general.options.manualHeat = msg.extractPayloadByte(4) === 1;
@@ -136,7 +151,7 @@ export class OptionsMessage {
                     let schem = state.chemControllers.getItemById(chem.id, true);
                     chem.ph.tank.capacity = chem.orp.tank.capacity = 6;
                     chem.ph.tank.units = chem.orp.tank.units = '';
-
+                    
                 }
                 else {
                     let chem = sys.chemControllers.getItemByAddress(144);
@@ -145,6 +160,27 @@ export class OptionsMessage {
                 }
                 msg.isProcessed = true;
                 break;
+            }
+            /* case 168:
+                {
+                    // IntelliChem Installed
+                    if ((msg.extractPayloadByte(3) & 0x01) === 1) {
+                        // only support for 1 ic with EasyTouch
+                        let chem = sys.chemControllers.getItemByAddress(144, true);
+                        let schem = state.chemControllers.getItemById(chem.id, true);
+                        chem.ph.tank.capacity = chem.orp.tank.capacity = 6;
+                        chem.ph.tank.units = chem.orp.tank.units = '';
+
+                    }
+                    else {
+                        let chem = sys.chemControllers.getItemByAddress(144);
+                        state.chemControllers.removeItemById(chem.id);
+                        sys.chemControllers.removeItemById(chem.id);
+                    }
+                    // Spa Manual Heat on/off
+                    sys.general.options.manualHeat = msg.extractPayloadByte(4) === 1 ? true : false;
+                    msg.isProcessed = true;
+                } */
         }
     }
 }

package/controller/comms/messages/config/PumpMessage.ts

@@ -132,8 +132,10 @@ export class PumpMessage {
                 }
             }
         }
+        msg.isProcessed = true;
         switch (msgId) {
             case 0:
+                msg.isProcessed = true;
                 break;
             case 1:
                 PumpMessage.processFlowStepSize(msg);
@@ -347,38 +349,20 @@ export class PumpMessage {
                 circuit.circuit = _circuit;
                 circuit.flow = msg.extractPayloadByte(circuitId * 2 + 4);
                 circuit.units = 1;
-                switch (circuit.circuit) {
-                    case 1:
-                        {
-                            let body = sys.bodies.getItemById(2, sys.equipment.maxBodies >= 2);
-                            let sbody = state.temps.bodies.getItemById(2, sys.equipment.maxBodies >= 2);
-                            sbody.type = body.type = 1; // spa
-                            body.isActive = true;
-                            break;
-                        }
-                    case 6:
-                        {
-                            let body = sys.bodies.getItemById(1, sys.equipment.maxBodies >= 1);
-                            let sbody = state.temps.bodies.getItemById(1, sys.equipment.maxBodies >= 1);
-                            sbody.type = body.type = 0; // pool
-                            body.isActive = true;
-                            body.capacity = msg.extractPayloadByte(6) * 1000;
-                            break;
-                        }
-                }
             }
             else {
                 pump.circuits.removeItemById(_circuit);
             }
         }
         pump.backgroundCircuit = msg.extractPayloadByte(1);
+        pump.filterSize = msg.extractPayloadByte(2) * 1000;
         pump.turnovers = msg.extractPayloadByte(3);
+        pump.manualFilterGPM = msg.extractPayloadByte(21);
         pump.primingSpeed = msg.extractPayloadByte(22);
         pump.primingTime = (msg.extractPayloadByte(23) & 0xf);
         pump.minFlow = sys.board.valueMaps.pumpTypes.get(pump.type).minFlow;
         pump.maxFlow = sys.board.valueMaps.pumpTypes.get(pump.type).maxFlow;
         pump.flowStepSize = sys.board.valueMaps.pumpTypes.get(pump.type).flowStepSize;
-        pump.manualFilterGPM = msg.extractPayloadByte(21);
         pump.maxSystemTime = msg.extractPayloadByte(23) >> 4;
         pump.maxPressureIncrease = msg.extractPayloadByte(24);
         pump.backwashFlow = msg.extractPayloadByte(25);

package/controller/comms/messages/config/RemoteMessage.ts

@@ -93,6 +93,7 @@ export class RemoteMessage {
                     if (!remote.button1 && !remote.button2 && !remote.button3 && !remote.button4) remote.isActive = false;
                     else remote.isActive = true;
                     remote.name = "QuickTouch";
+                    msg.isProcessed = true;
                     break;
                 }
             case 32: // is4/is10
@@ -120,6 +121,7 @@ export class RemoteMessage {
                         remote.type = 1;
                         remote.name = "is4";
                     }
+                    msg.isProcessed = true;
                     break;
                 }
             case 22: // Spa Command spa side remote additional config
@@ -132,6 +134,7 @@ export class RemoteMessage {
                     remote.pumpId = msg.extractPayloadByte(5);
                     remote.stepSize = msg.extractPayloadByte(6);
                     remote.type = 7;
+                    msg.isProcessed = true;
                     break;
                 }
         }
@@ -187,5 +190,6 @@ export class RemoteMessage {
             }
             remote["button" + (i + 1)] = msg.extractPayloadByte(i + 2);
         }
+        msg.isProcessed = true;
     }
 }