Change processng for VF pumps discussion #1004

tagyoureit · Jul 20, 2024 · 35e494f · 35e494f
1 parent 0267217
commit 35e494f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/controller/comms/messages/status/PumpStateMessage.ts b/controller/comms/messages/status/PumpStateMessage.ts
@@ -105,7 +105,7 @@ export class PumpStateMessage {
                 pump.mode = msg.extractPayloadByte(1);
                 pump.driveState = msg.extractPayloadByte(2);
                 pump.watts = (msg.extractPayloadByte(3) * 256) + msg.extractPayloadByte(4);
-                pump.rpm = (typeof ptype !== 'undefined' && ptype.maxSpeed > 0) ? (msg.extractPayloadByte(5) * 256) + msg.extractPayloadByte(6) : 0;
+                pump.rpm = (typeof ptype !== 'undefined' && (ptype.maxSpeed > 0 || ptype.name === 'VF')) ? (msg.extractPayloadByte(5) * 256) + msg.extractPayloadByte(6) : 0;
                 pump.flow = (typeof ptype !== 'undefined' && ptype.maxFlow > 0) ? msg.extractPayloadByte(7) : 0;
                 pump.ppc = msg.extractPayloadByte(8);
                 pump.status = (msg.extractPayloadByte(11) * 256) + msg.extractPayloadByte(12); // 16-bits of error codes.

diff --git a/controller/nixie/pumps/Pump.ts b/controller/nixie/pumps/Pump.ts
@@ -772,7 +772,8 @@ export class NixiePumpVF extends NixiePumpRS485 {
                 // When we are not 0 then it sends 4[255], 6[10], 5[6], 1[flow]
                 if (!this.closing) await this.setPumpToRemoteControlAsync(); // Action 4
                 if (!this.closing) await this.setDriveStateAsync();         // Action 6
-                if (!this.closing) await this.setPumpFeatureAsync(this._targetSpeed > 0 ? 6 : undefined); // Action 5
+                //if (!this.closing) await this.setPumpFeatureAsync(this._targetSpeed > 0 ? 6 : undefined); // Action 5
+                if (!this.closing) await this.setPumpFeatureAsync(6); // Action 5
                 if (!this.closing && this._targetSpeed > 0) await this.setPumpGPMAsync(); // Action 1
                 if (!this.closing) await setTimeout(200);
                 if (!this.closing) await this.requestPumpStatusAsync(); // Action 7