= {}
+ const now = Date.now()
+
+ Object.values(sensorData).forEach(sensor => {
+ if (sensor.status === 'warning' && sensor.warningStartTime && sensor.warningDelayMs) {
+ const elapsed = now - sensor.warningStartTime
+ const remaining = Math.max(0, sensor.warningDelayMs - elapsed)
+ if (remaining > 0) {
+ newCountdowns[sensor.id] = remaining
+ }
+ }
+ })
+
+ setCountdowns(newCountdowns)
+ }, 1000)
+
+ return () => clearInterval(interval)
+ }, [sensorData])
+
+ const formatCountdown = (ms: number) => {
+ const minutes = Math.floor(ms / 60000)
+ const seconds = Math.floor((ms % 60000) / 1000)
+ return `${minutes}:${seconds.toString().padStart(2, '0')}`
+ }
+
+ const warningCountdowns = Object.entries(countdowns).filter(([, time]) => time > 0)
return (
@@ -16,6 +48,37 @@ export function BedPressureHeader() {
{isMonitoring ? "Live" : "Paused"}
+
+ {/* Warning Countdown Indicators */}
+ {warningCountdowns.length > 0 && (
+
+ {warningCountdowns.slice(0, 3).map(([sensorId, timeRemaining]) => {
+ const sensor = sensorData[sensorId]
+ return (
+
+
+
+ {sensor?.label}
+
+
+
+
+ {formatCountdown(timeRemaining)}
+
+
+
+ )
+ })}
+ {warningCountdowns.length > 3 && (
+
+ +{warningCountdowns.length - 3} more
+
+ )}
+
+ )}
diff --git a/stores/bedPressureStore.ts b/stores/bedPressureStore.ts
index 0d4aa1d..46f7246 100644
--- a/stores/bedPressureStore.ts
+++ b/stores/bedPressureStore.ts
@@ -1,14 +1,6 @@
import { create } from 'zustand'
import { AlarmManager, AlarmEvent } from '@/services/AlarmManager'
-
-export interface SensorConfig {
- id: string;
- x: number;
- y: number;
- zone: string;
- label: string;
- pin?: number;
-}
+import { SensorConfig } from '@/types/sensor'
export interface SensorData {
id: string;
@@ -25,6 +17,7 @@ export interface SensorData {
warningThreshold?: number;
alarmThreshold?: number;
warningDelayMs?: number;
+ warningStartTime?: number; // Track when warning state started
}
export interface Alert {
@@ -160,27 +153,77 @@ export const useBedPressureStore = create((set, get) => ({
digitalState?: number;
warningThreshold?: number;
alarmThreshold?: number;
+ warningDelayMs?: number;
status?: string;
}) => {
const currentSensor = updated[sensor.id];
const newValue = sensor.value;
+ const config = sensorConfig.find(s => s.id === sensor.id);
+
+ // Get thresholds from sensor data or config
+ const warningThreshold = sensor.warningThreshold || config?.warningThreshold || 2500;
+ const alarmThreshold = sensor.alarmThreshold || config?.alarmThreshold || 3500;
+ const warningDelayMs = sensor.warningDelayMs || config?.warningDelayMs || 60000;
- // Check for alarms based on thresholds
- if (sensor.alarmThreshold && newValue >= sensor.alarmThreshold) {
- alarmManager.addAlarm(sensor.id, sensor.label, 'alarm', newValue, sensor.alarmThreshold);
- } else if (sensor.warningThreshold && newValue >= sensor.warningThreshold) {
- alarmManager.addAlarm(sensor.id, sensor.label, 'warning', newValue, sensor.warningThreshold);
- } else {
- alarmManager.clearAlarm(sensor.id);
- }
+ // Determine status and handle alarm logic
+ let status = 'normal';
+ let warningStartTime = currentSensor?.warningStartTime;
+ const now = Date.now();
- // Check for alerts (legacy alert system)
- if (newValue > 3000 && currentSensor && currentSensor.currentValue <= 3000) {
+ if (newValue >= alarmThreshold) {
+ status = 'alarm';
+ warningStartTime = undefined; // Clear warning timer for immediate alarm
+
+ // Add alarm
+ alarmManager.addAlarm(
+ sensor.id,
+ sensor.label,
+ 'alarm',
+ newValue,
+ alarmThreshold
+ );
+
newAlerts.push({
id: `${sensor.id}-${Date.now()}`,
- message: `High value detected at ${sensor.label}`,
+ message: `ALARM: High value detected at ${sensor.label} (${newValue})`,
time: new Date().toLocaleTimeString(),
});
+
+ } else if (newValue >= warningThreshold) {
+ status = 'warning';
+
+ if (!warningStartTime) {
+ warningStartTime = now; // Start warning timer
+ } else if (now - warningStartTime >= warningDelayMs) {
+ status = 'alarm'; // Escalate to alarm after delay
+
+ // Add escalated alarm
+ alarmManager.addAlarm(
+ sensor.id,
+ sensor.label,
+ 'alarm',
+ newValue,
+ warningThreshold
+ );
+
+ newAlerts.push({
+ id: `${sensor.id}-${Date.now()}`,
+ message: `ALARM: Warning escalated for ${sensor.label} (${newValue})`,
+ time: new Date().toLocaleTimeString(),
+ });
+ } else {
+ // Add warning alarm
+ alarmManager.addAlarm(
+ sensor.id,
+ sensor.label,
+ 'warning',
+ newValue,
+ warningThreshold
+ );
+ }
+ } else {
+ warningStartTime = undefined; // Clear warning timer
+ alarmManager.clearAlarm(sensor.id); // Clear any existing alarms
}
// Update sensor data
@@ -204,12 +247,14 @@ export const useBedPressureStore = create((set, get) => ({
timestamp: Date.now(),
value: newValue,
}],
- status: sensor.status || (newValue > 3000 ? "critical" : newValue > 2500 ? "warning" : "normal"),
+ status,
source: sensor.source,
pin: sensor.pin,
digitalState: sensor.digitalState,
- warningThreshold: sensor.warningThreshold,
- alarmThreshold: sensor.alarmThreshold
+ warningThreshold,
+ alarmThreshold,
+ warningDelayMs,
+ warningStartTime
};
});
diff --git a/types/sensor.ts b/types/sensor.ts
new file mode 100644
index 0000000..5833496
--- /dev/null
+++ b/types/sensor.ts
@@ -0,0 +1,24 @@
+export interface SensorConfig {
+ id: string;
+ x: number;
+ y: number;
+ zone: string;
+ label: string;
+ pin?: number;
+ warningThreshold: number;
+ alarmThreshold: number;
+ warningDelayMs: number; // Duration in milliseconds before warning escalates to alarm
+ baseNoise?: number; // For hardware sensors - noise level for analog conversion
+}
+
+export interface SensorThresholds {
+ warningThreshold: number;
+ alarmThreshold: number;
+ warningDelayMs: number;
+}
+
+export interface SensorZoneConfig {
+ zone: string;
+ defaultThresholds: SensorThresholds;
+ description: string;
+}
\ No newline at end of file
diff --git a/utils/sensorConfig.ts b/utils/sensorConfig.ts
new file mode 100644
index 0000000..271b356
--- /dev/null
+++ b/utils/sensorConfig.ts
@@ -0,0 +1,152 @@
+import { SensorConfig, SensorZoneConfig } from '@/types/sensor';
+
+// Define zone-based default configurations
+export const ZONE_CONFIGS: Record = {
+ head: {
+ zone: 'head',
+ defaultThresholds: {
+ warningThreshold: 3000,
+ alarmThreshold: 3500,
+ warningDelayMs: 30000 // 30 seconds - critical area needs fast response
+ },
+ description: 'Head area - most critical, fastest escalation'
+ },
+ shoulders: {
+ zone: 'shoulders',
+ defaultThresholds: {
+ warningThreshold: 2800,
+ alarmThreshold: 3200,
+ warningDelayMs: 45000 // 45 seconds
+ },
+ description: 'Shoulder area - high priority, moderate escalation'
+ },
+ back: {
+ zone: 'back',
+ defaultThresholds: {
+ warningThreshold: 2500,
+ alarmThreshold: 3000,
+ warningDelayMs: 60000 // 1 minute
+ },
+ description: 'Back area - moderate priority, standard escalation'
+ },
+ hips: {
+ zone: 'hips',
+ defaultThresholds: {
+ warningThreshold: 2200,
+ alarmThreshold: 2800,
+ warningDelayMs: 90000 // 90 seconds
+ },
+ description: 'Hip area - moderate priority, longer escalation'
+ },
+ legs: {
+ zone: 'legs',
+ defaultThresholds: {
+ warningThreshold: 2000,
+ alarmThreshold: 2500,
+ warningDelayMs: 120000 // 2 minutes
+ },
+ description: 'Leg area - lower priority, extended escalation'
+ },
+ feet: {
+ zone: 'feet',
+ defaultThresholds: {
+ warningThreshold: 1500,
+ alarmThreshold: 1800,
+ warningDelayMs: 180000 // 3 minutes
+ },
+ description: 'Feet area - lowest priority, longest escalation'
+ }
+};
+
+/**
+ * Validates sensor configuration against zone defaults
+ */
+export function validateSensorConfig(config: SensorConfig): {
+ isValid: boolean;
+ warnings: string[];
+ errors: string[];
+} {
+ const warnings: string[] = [];
+ const errors: string[] = [];
+
+ // Check if zone exists
+ const zoneConfig = ZONE_CONFIGS[config.zone];
+ if (!zoneConfig) {
+ errors.push(`Unknown zone: ${config.zone}`);
+ return { isValid: false, warnings, errors };
+ }
+
+ // Validate threshold values
+ if (config.alarmThreshold <= config.warningThreshold) {
+ errors.push(`Alarm threshold (${config.alarmThreshold}) must be greater than warning threshold (${config.warningThreshold})`);
+ }
+
+ if (config.warningThreshold <= 0 || config.alarmThreshold <= 0) {
+ errors.push('Thresholds must be positive values');
+ }
+
+ if (config.warningDelayMs <= 0) {
+ errors.push('Warning delay must be positive');
+ }
+
+ // Check against zone defaults (warnings only)
+ const defaults = zoneConfig.defaultThresholds;
+ const tolerance = 0.2; // 20% tolerance
+
+ if (Math.abs(config.warningThreshold - defaults.warningThreshold) / defaults.warningThreshold > tolerance) {
+ warnings.push(`Warning threshold (${config.warningThreshold}) differs significantly from zone default (${defaults.warningThreshold})`);
+ }
+
+ if (Math.abs(config.alarmThreshold - defaults.alarmThreshold) / defaults.alarmThreshold > tolerance) {
+ warnings.push(`Alarm threshold (${config.alarmThreshold}) differs significantly from zone default (${defaults.alarmThreshold})`);
+ }
+
+ if (Math.abs(config.warningDelayMs - defaults.warningDelayMs) / defaults.warningDelayMs > tolerance) {
+ warnings.push(`Warning delay (${config.warningDelayMs}ms) differs significantly from zone default (${defaults.warningDelayMs}ms)`);
+ }
+
+ return { isValid: errors.length === 0, warnings, errors };
+}
+
+/**
+ * Creates a sensor config with zone defaults as base
+ */
+export function createSensorConfig(
+ id: string,
+ position: { x: number; y: number },
+ zone: string,
+ label: string,
+ overrides: Partial = {}
+): SensorConfig {
+ const zoneConfig = ZONE_CONFIGS[zone];
+ if (!zoneConfig) {
+ throw new Error(`Unknown zone: ${zone}`);
+ }
+
+ return {
+ id,
+ x: position.x,
+ y: position.y,
+ zone,
+ label,
+ ...zoneConfig.defaultThresholds,
+ ...overrides
+ };
+}
+
+/**
+ * Gets human-readable duration string
+ */
+export function formatDuration(ms: number): string {
+ const seconds = Math.floor(ms / 1000);
+ const minutes = Math.floor(seconds / 60);
+ const hours = Math.floor(minutes / 60);
+
+ if (hours > 0) {
+ return `${hours}h ${minutes % 60}m`;
+ } else if (minutes > 0) {
+ return `${minutes}m ${seconds % 60}s`;
+ } else {
+ return `${seconds}s`;
+ }
+}
\ No newline at end of file