Ismail/CPLv4.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP: Timer für jeder KÜ separate und nicht eine für alle, aktuell wird prozentzahl bei allen das gleiche angezeigt

Browse Source
This commit is contained in:
ISA
2025-09-08 10:41:46 +02:00
parent d38d3191c5
commit 9c218b2a1d
11 changed files with 164 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
redux/slices/deviceEventsSlice.ts
View File

@@ -3,13 +3,17 @@ import { createSlice, PayloadAction } from "@reduxjs/toolkit";
export interface DeviceEventsState {
ksx: number[]; // 32 Slots: Schleifenmessung aktiv
ksy: number[]; // 32 Slots: TDR-Messung aktiv
ksz: number[]; // 32 Slots: Abgleich aktiv
ksz: number[]; // 32 Slots: Comparison (ehem. Abgleich) aktiv
anyLoopActive: boolean;
anyTdrActive: boolean;
anyAlignmentActive: boolean;
anyComparisonActive: boolean; // renamed from anyAlignmentActive
loopStartedAt: number | null; // unix ms timestamp when KSX became active
tdrStartedAt: number | null; // unix ms timestamp when KSY became active
alignmentStartedAt: number | null; // unix ms timestamp when KSZ became active
comparisonStartedAt: number | null; // renamed from alignmentStartedAt
// per-slot start timestamps (persistable)
loopStartedAtBySlot: (number | null)[];
tdrStartedAtBySlot: (number | null)[];
comparisonStartedAtBySlot: (number | null)[]; // renamed from alignmentStartedAtBySlot
}
const ZERO32 = Array.from({ length: 32 }, () => 0);
@@ -20,10 +24,13 @@ const initialState: DeviceEventsState = {
ksz: ZERO32.slice(),
anyLoopActive: false,
anyTdrActive: false,
anyAlignmentActive: false,
anyComparisonActive: false,
loopStartedAt: null,
tdrStartedAt: null,
alignmentStartedAt: null,
comparisonStartedAt: null,
loopStartedAtBySlot: Array.from({ length: 32 }, () => null),
tdrStartedAtBySlot: Array.from({ length: 32 }, () => null),
comparisonStartedAtBySlot: Array.from({ length: 32 }, () => null),
};
export const deviceEventsSlice = createSlice({
@@ -36,7 +43,10 @@ export const deviceEventsSlice = createSlice({
) {
const prevLoop = state.anyLoopActive;
const prevTdr = state.anyTdrActive;
const prevAlign = state.anyAlignmentActive;
const prevCompare = state.anyComparisonActive;
const prevKsx = state.ksx.slice();
const prevKsy = state.ksy.slice();
const prevKsz = state.ksz.slice();
const to32 = (arr?: number[]) => {
if (!Array.isArray(arr)) return ZERO32.slice();
const a = arr
@@ -50,17 +60,36 @@ export const deviceEventsSlice = createSlice({
state.ksz = to32(action.payload.ksz);
state.anyLoopActive = state.ksx.some((v) => v === 1);
state.anyTdrActive = state.ksy.some((v) => v === 1);
state.anyAlignmentActive = state.ksz.some((v) => v === 1);
state.anyComparisonActive = state.ksz.some((v) => v === 1);
// Transition detection to set/reset startedAt timestamps
// Global transition detection
if (!prevLoop && state.anyLoopActive) state.loopStartedAt = Date.now();
if (prevLoop && !state.anyLoopActive) state.loopStartedAt = null;
if (!prevTdr && state.anyTdrActive) state.tdrStartedAt = Date.now();
if (prevTdr && !state.anyTdrActive) state.tdrStartedAt = null;
if (!prevAlign && state.anyAlignmentActive)
state.alignmentStartedAt = Date.now();
if (prevAlign && !state.anyAlignmentActive)
state.alignmentStartedAt = null;
if (!prevCompare && state.anyComparisonActive)
state.comparisonStartedAt = Date.now();
if (prevCompare && !state.anyComparisonActive)
state.comparisonStartedAt = null;
// Per-slot transition detection
for (let i = 0; i < 32; i++) {
if (prevKsx[i] === 0 && state.ksx[i] === 1) {
state.loopStartedAtBySlot[i] = Date.now();
} else if (prevKsx[i] === 1 && state.ksx[i] === 0) {
state.loopStartedAtBySlot[i] = null;
}
if (prevKsy[i] === 0 && state.ksy[i] === 1) {
state.tdrStartedAtBySlot[i] = Date.now();
} else if (prevKsy[i] === 1 && state.ksy[i] === 0) {
state.tdrStartedAtBySlot[i] = null;
}
if (prevKsz[i] === 0 && state.ksz[i] === 1) {
state.comparisonStartedAtBySlot[i] = Date.now();
} else if (prevKsz[i] === 1 && state.ksz[i] === 0) {
state.comparisonStartedAtBySlot[i] = null;
}
}
},
resetEvents(state) {
state.ksx = ZERO32.slice();
@@ -68,13 +97,39 @@ export const deviceEventsSlice = createSlice({
state.ksz = ZERO32.slice();
state.anyLoopActive = false;
state.anyTdrActive = false;
state.anyAlignmentActive = false;
state.anyComparisonActive = false;
state.loopStartedAt = null;
state.tdrStartedAt = null;
state.alignmentStartedAt = null;
state.comparisonStartedAt = null;
state.loopStartedAtBySlot = Array.from({ length: 32 }, () => null);
state.tdrStartedAtBySlot = Array.from({ length: 32 }, () => null);
state.comparisonStartedAtBySlot = Array.from({ length: 32 }, () => null);
},
initPersistedTimings(
state,
action: PayloadAction<{
loop?: (number | null)[];
tdr?: (number | null)[];
compare?: (number | null)[]; // renamed key
}>
) {
const normalize = (arr?: (number | null)[]) => {
const out: (number | null)[] = Array.isArray(arr)
? arr.slice(0, 32).map((v) => (typeof v === "number" ? v : null))
: [];
while (out.length < 32) out.push(null);
return out;
};
if (action.payload.loop)
state.loopStartedAtBySlot = normalize(action.payload.loop);
if (action.payload.tdr)
state.tdrStartedAtBySlot = normalize(action.payload.tdr);
if (action.payload.compare)
state.comparisonStartedAtBySlot = normalize(action.payload.compare);
},
},
});
export const { setEvents, resetEvents } = deviceEventsSlice.actions;
export const { setEvents, resetEvents, initPersistedTimings } =
deviceEventsSlice.actions;
export default deviceEventsSlice.reducer;