update fix; etc. tag:V2 Updates
Took 1 hour 16 minutes
This commit is contained in:
@ -10,6 +10,8 @@ import {Settings} from "../../Settings";
|
||||
import Ingredient from "../../database/Ingredient";
|
||||
import {RequestType} from "../../RequestType";
|
||||
import {IJob} from "../../database/IJob";
|
||||
import {SensorHelper} from "../../SensorHelper";
|
||||
import {IContainer} from "../../database/IContainer";
|
||||
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
@ -71,7 +73,7 @@ router.ws('/', async (ws, req, next) => {
|
||||
}
|
||||
|
||||
case WebSocketEvent.CONTAINER_UPDATE: {
|
||||
let container = await Container.findById(msg.data["container"]);
|
||||
let container : IContainer | null = await Container.findById(msg.data["container"]);
|
||||
if (!container) break;
|
||||
|
||||
let ingredient;
|
||||
@ -81,8 +83,25 @@ router.ws('/', async (ws, req, next) => {
|
||||
ingredient = undefined;
|
||||
}
|
||||
|
||||
container.filled = parseInt(msg.data["filled"]);
|
||||
container.volume = parseInt(msg.data["filled"]); // V2: Volume is now being updated after change of ingredient
|
||||
let filled : number = parseInt(msg.data["filled"]);
|
||||
|
||||
container.filled = filled;
|
||||
container.volume = filled; // V2: Volume is now being updated after change of ingredient
|
||||
|
||||
if( container.sensorType != SensorType.NONE )
|
||||
{
|
||||
let raw = SensorHelper.measure(container);
|
||||
if( !raw )
|
||||
{
|
||||
await WebSocketHandler.send(new WebSocketPayload(WebSocketEvent.ERROR, "Der Sensor hat beim Austarieren einen ungültigen Wert zurückgegeben.<br>Dies weist auf eine Fehlkonfiguration oder kaputten Sensor hin.<br>Aus Sicherheitsgründen wurde der Sensor für diesen Behälter deaktiviert." ));
|
||||
}
|
||||
else
|
||||
{
|
||||
container.sensorDelta = raw - filled; // V2: Kalkuliere differenz zwischen Gewicht und gefülltem Inhalt // Todo Möglicherweise ist der "raw"-Wert nicht Gewicht
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
container.content = ingredient;
|
||||
|
||||
await container.save();
|
||||
|
Reference in New Issue
Block a user