#936 - Make it possible to shut on / off machine

Author: graphefruit

src/app/preparation/preparation-popover-actions/preparation-popover-actions.component.ts

@@ -8,6 +8,7 @@ import { PREPARATION_STYLE_TYPE } from '../../../enums/preparations/preparationS
 import { PreparationDeviceType } from '../../../classes/preparationDevice';
 import { PREPARATION_FUNCTION_PIPE_ENUM } from '../../../enums/preparations/preparationFunctionPipe';
 import { SanremoYOUDevice } from '../../../classes/preparationDevice/sanremo/sanremoYOUDevice';
+import { XeniaDevice } from '../../../classes/preparationDevice/xenia/xeniaDevice';
 
 @Component({
   selector: 'preparation-popover-actions',
@@ -56,6 +57,24 @@ export class PreparationPopoverActionsComponent implements OnInit {
         } catch (ex) {
           this.isMachineConnected = false;
         }
+      } else if (
+        this.data.connectedPreparationDevice?.type ===
+        PreparationDeviceType.XENIA
+      ) {
+        const device: XeniaDevice =
+          this.data.getConnectedDevice() as XeniaDevice;
+        try {
+          if (device.deviceConnected()) {
+            this.isMachineConnected = true;
+            device.isMachineTurnedOn().then((isTurnedOn) => {
+              this.isMachineTurnedOn = isTurnedOn;
+            });
+          } else {
+            this.isMachineConnected = false;
+          }
+        } catch (ex) {
+          this.isMachineConnected = false;
+        }
       }
     }
   }

src/classes/preparationDevice/meticulous/meticulousDevice.ts

@@ -46,7 +46,7 @@ export class MeticulousDevice extends PreparationDevice {
       realtimeWaterFlow.brew_time = '';
       realtimeWaterFlow.timestamp = timestamp;
       realtimeWaterFlow.smoothed_weight = 0;
-      realtimeWaterFlow.flow_value = shotEntry.flow;
+      realtimeWaterFlow.flow_value = shotEntry.gravimetric_flow;
       realtimeWaterFlow.timestampdelta = 0;
 
       newBrewFlow.realtimeFlow.push(realtimeWaterFlow);

src/classes/preparationDevice/xenia/xeniaDevice.ts

@@ -5,7 +5,7 @@ import { Preparation } from '../../preparation/preparation';
 import { IXeniaParams } from '../../../interfaces/preparationDevices/iXeniaParams';
 import { UILog } from '../../../services/uiLog';
 import { CapacitorHttp, HttpResponse } from '@capacitor/core';
-import moment from 'moment';
+import { sleep } from '../../devices';
 
 export class XeniaDevice extends PreparationDevice {
   public scriptList: Array<{ INDEX: number; TITLE: string }> = [];
@@ -162,6 +162,94 @@ export class XeniaDevice extends PreparationDevice {
     }
   }
 
+  public async isMachineTurnedOn(): Promise<boolean> {
+    try {
+      let url = this.getPreparation().connectedPreparationDevice.url;
+      if (this.apiVersion === 1) {
+        url += '/overview';
+      } else {
+        url += '/api/v2/overview';
+      }
+
+      const options = {
+        url: url,
+        connectTimeout: 5000,
+      };
+
+      const response: HttpResponse = await CapacitorHttp.get(options);
+      const responseJSON = await response.data;
+
+      return responseJSON.MA_STATUS === 1;
+      // TODO Capacitor migration: The code before the migration didn't do
+      // anything else, but there was unreachable code below it.
+      // Please double check.
+    } catch (error) {
+      this.logError('Error in isMachineTurnedOn():', error);
+      return false;
+    }
+  }
+
+  public async turnOnMachine() {
+    let url = this.getPreparation().connectedPreparationDevice.url;
+    let options: any;
+
+    // TODO Capacitor migration: It's very likely that this will be broken by
+    // the migration, please test again.
+    if (this.apiVersion === 1) {
+      return;
+    } else {
+      url += '/api/v2/machine/control/';
+      options = {
+        url: url,
+        data: JSON.stringify({ action: '1' }),
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+        },
+      };
+    }
+
+    try {
+      const response = await CapacitorHttp.post(options);
+      const responseJSON = await response.data;
+      await sleep(500);
+      const isTurnedOn = await this.isMachineTurnedOn();
+      return isTurnedOn;
+    } catch (error) {
+      this.logError('Error in turnOnMachine():', error);
+      return false;
+    }
+  }
+  public async turnOffMachine() {
+    let url = this.getPreparation().connectedPreparationDevice.url;
+    let options: any;
+
+    // TODO Capacitor migration: It's very likely that this will be broken by
+    // the migration, please test again.
+    if (this.apiVersion === 1) {
+      return;
+    } else {
+      url += '/api/v2/machine/control/';
+      options = {
+        url: url,
+        data: JSON.stringify({ action: '0' }),
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+        },
+      };
+    }
+
+    try {
+      const response = await CapacitorHttp.post(options);
+      const responseJSON = await response.data;
+      await sleep(500);
+      const isTurnedOn = await this.isMachineTurnedOn();
+      return !isTurnedOn;
+    } catch (error) {
+      this.logError('Error in turnOffMachine():', error);
+      return false;
+    }
+  }
+
   public async getScripts(): Promise<any> {
     let url = this.getPreparation().connectedPreparationDevice.url;
     if (this.apiVersion === 1) {

src/components/brews/brew-brewing-preparation-device/brew-brewing-preparation-device.component.ts

@@ -725,7 +725,8 @@ export class BrewBrewingPreparationDeviceComponent implements OnInit {
       realtimeWaterFlow.brew_time = '';
       realtimeWaterFlow.timestamp = timestamp;
       realtimeWaterFlow.smoothed_weight = 0;
-      realtimeWaterFlow.flow_value = shotEntry.flow;
+
+      realtimeWaterFlow.flow_value = shotEntry.gravimetric_flow;
       realtimeWaterFlow.timestampdelta = 0;
 
       newBrewFlow.realtimeFlow.push(realtimeWaterFlow);