V2: Remap many stuff
Took 3 hours 0 minutes
This commit is contained in:
@ -12,6 +12,7 @@ import {RequestType} from "../../RequestType";
|
||||
import {IJob} from "../../database/IJob";
|
||||
import {SensorHelper} from "../../SensorHelper";
|
||||
import {IContainer} from "../../database/IContainer";
|
||||
import {Mixer} from "../../Mixer";
|
||||
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
@ -80,11 +81,11 @@ router.ws('/', async (ws, req, next) => {
|
||||
container.volume = filled; // V2: Volume is now being updated after change of ingredient
|
||||
|
||||
if (container.sensorType != SensorType.NONE) {
|
||||
let raw = SensorHelper.measure(container);
|
||||
let raw = SensorHelper.measureRaw(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.sensorDelta = await raw - filled; // V2: Kalkuliere differenz zwischen Gewicht und gefülltem Inhalt // Todo Möglicherweise ist der "raw"-Wert nicht Gewicht
|
||||
}
|
||||
}
|
||||
|
||||
@ -149,7 +150,7 @@ router.ws('/', async (ws, req, next) => {
|
||||
break;
|
||||
}
|
||||
case RequestType.JOB: {
|
||||
WebSocketHandler.answerRequest(msg.data["type"] as RequestType, iTender.currentJob);
|
||||
WebSocketHandler.answerRequest(msg.data["type"] as RequestType, Mixer.currentJob);
|
||||
break;
|
||||
}
|
||||
case RequestType.DOWNLOAD_DRINKS: {
|
||||
@ -158,7 +159,7 @@ router.ws('/', async (ws, req, next) => {
|
||||
break;
|
||||
}
|
||||
case RequestType.CHECK: {
|
||||
await iTender.clearAllRawMeasurements();
|
||||
await SensorHelper.clearAllRawMeasurements();
|
||||
|
||||
|
||||
let content : {error: boolean, msg: string} = {
|
||||
@ -174,7 +175,7 @@ router.ws('/', async (ws, req, next) => {
|
||||
}
|
||||
|
||||
// Check measurements
|
||||
await iTender.measureAllRaw();
|
||||
await SensorHelper.measureAllRaw();
|
||||
for( let c of await Container.find() )
|
||||
{
|
||||
if( c.sensorType != SensorType.NONE && c.rawData == -1 )
|
||||
@ -202,7 +203,7 @@ router.ws('/', async (ws, req, next) => {
|
||||
|
||||
async function measureAndSafe() {
|
||||
try {
|
||||
await iTender.measureAllRaw();
|
||||
await SensorHelper.measureAllRaw();
|
||||
for (let c of await Container.find({})) {
|
||||
if (c.sensorType != SensorType.NONE) {
|
||||
c.sensorTare += c.rawData;
|
||||
|
Reference in New Issue
Block a user