chroe: updates

Author: Russell Green

lib/fill/Filler.ts

@@ -40,7 +40,7 @@ export class Filler {
     return [
       this.options.valves.drainPin,
       this.options.valves.supplyPin,
-      this.options.valves.supplyPin
+      this.options.valves.targetPin
     ];
   }
 
@@ -150,7 +150,7 @@ export class Filler {
 
   private async skipIfAlreadyFull(): Promise<boolean> {
     const startLevel = this.status.startLevel as number;
-    const isFull = startLevel <= this.levelSensor.fullLevel;
+    const isFull = this.levelSensor.isFullValue(startLevel);
 
     if (isFull) {
       this.log.info(`Skipping run due to level already full`);

lib/level/DP5200LevelSensor.ts

@@ -29,6 +29,10 @@ export class DP5200Sensor implements LevelSensor {
     this.log = createLogger(`LevelSensor(${options.type})`);
   }
 
+  isFullValue(value: number): boolean {
+    return value >= this.fullLevel;
+  }
+
   async getLevel(): Promise<number> {
     const value = await this.piServer.getPin(this.options.readPin);
     return value === this.options.fullIndicatorValue ? 1 : 0;
@@ -46,11 +50,14 @@ export class DP5200Sensor implements LevelSensor {
   ): Promise<number> {
     try {
       let level = await this.getLevelAveraged(averagingOptions);
-      while (level < this.fullLevel) {
-        this.log.debug(`Waiting for level ${level} to equal 1`);
+      let isNotFull = !this.isFullValue(level);
 
+      while (isNotFull) {
+        this.log.debug(`Waiting for level ${level} to equal 1`);
         await wait(millisecondsDelay);
+
         level = await this.getLevelAveraged(averagingOptions);
+        isNotFull = !this.isFullValue(level);
       }
 
       this.log.debug(`Level reached`);

lib/level/LevelSensor.ts

@@ -12,6 +12,7 @@ export interface WaitForLevelOptions extends Partial<AveragingOptions> {
 export interface LevelSensor {
   get fullLevel(): number;
   getLevel(): Promise<number>;
+  isFullValue(value: number): boolean;
   getLevelAveraged(options?: Partial<AveragingOptions>): Promise<number>;
   waitUntilFull(
     averagingOptions?: Partial<AveragingOptions>,

lib/level/LevelSensorBase.ts

@@ -43,6 +43,10 @@ export abstract class LevelSensorBase implements LevelSensor {
     this.log = createLogger(`LevelSensor(${options.type})`);
   }
 
+  isFullValue(value: number): boolean {
+    return value <= this.fullLevel;
+  }
+
   async getLevel(): Promise<number> {
     const endpoint = `${this.sensorEndpoint}/${this.options.endpointPath}`;
     const { retryCount, retryWait } = this.options;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "raspberry-pi-client",
-  "version": "1.0.0-rc.16",
+  "version": "1.0.0-rc.17",
   "private": true,
   "scripts": {
     "dev": "next dev",