Merge branch 'master' into 'dev'
# Conflicts: # src/lib/core/handlers/adbPayloadHandler.ts # src/lib/core/handlers/messageHandler.ts # src/routes/(authed)/tools/brew/+page.svelte
This commit is contained in:
commit
58b496d5c8
9 changed files with 304 additions and 42 deletions
|
|
@ -1,3 +1,4 @@
|
|||
import { get } from 'svelte/store';
|
||||
import { updateMachineStatus } from '../stores/machineInfoStore';
|
||||
import { addNotification } from '../stores/noti';
|
||||
import {
|
||||
|
|
@ -6,6 +7,7 @@ import {
|
|||
} from '../services/androidRecipeExportService';
|
||||
import { handleIncomingMessages } from './messageHandler';
|
||||
import { setMenuSaved, setMenuSaveError } from '../stores/menuSaveStore';
|
||||
import { recipeFromMachineQuery } from '../stores/recipeStore';
|
||||
|
||||
type AdbPayload = { type: string; payload: any };
|
||||
|
||||
|
|
@ -104,9 +106,21 @@ async function handleAdbPayload(raw_payload: string) {
|
|||
let plist = payload.payload.split('/');
|
||||
let pd = plist[0] ?? '';
|
||||
let total_time = plist[1] ?? '';
|
||||
let mode_ref = plist[2] ?? '';
|
||||
|
||||
// update recipe data store
|
||||
console.log('brewing finish', pd, 'total time', total_time);
|
||||
|
||||
// update recipe from brew now
|
||||
let recipeDevSnapshot = get(recipeFromMachineQuery) ?? {};
|
||||
let recipe01Snap = recipeDevSnapshot['recipe'];
|
||||
if (recipe01Snap) {
|
||||
recipe01Snap[pd].total_time =
|
||||
mode_ref != 'sim' ? total_time : recipe01Snap[pd].total_time;
|
||||
|
||||
recipeDevSnapshot['recipe'] = recipe01Snap;
|
||||
recipeFromMachineQuery.set(recipeDevSnapshot);
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue