{/* Top: Controls (Scrollable if needed) */}
@@ -1286,7 +1341,13 @@ const App: React.FC = () => {
{/* Middle 1: BMS Panel (Fixed) */}
- setAgvState(s => ({ ...s, batteryLevel: l }))} />
+ setAgvState(s => ({ ...s, batteryLevel: l }))}
+ setIsCharging={(isConnected) => {
+ setAgvState(s => ({ ...s, isCharging: isConnected }));
+ }}
+ />
{/* Bottom: System Logs (Fixed Height) */}
diff --git a/bms_sim_code.txt b/bms_sim_code.txt
new file mode 100644
index 0000000..02a9fc6
--- /dev/null
+++ b/bms_sim_code.txt
@@ -0,0 +1,33 @@
+ // BMS Simulation
+ useEffect(() => {
+ const timer = setInterval(() => {
+ setAgvState(s => {
+ const isCharging = s.isCharging;
+ let newLevel = s.batteryLevel;
+
+ if (isCharging) {
+ // Charge: 1% per min (faster than discharge)
+ newLevel = Math.min(100, s.batteryLevel + (1.0 / 60));
+ } else {
+ // Discharge: 5% per 10 min = 0.5% per min = 0.5 / 60 per sec
+ newLevel = Math.max(0, s.batteryLevel - (0.5 / 60));
+ }
+
+ // Fluctuate Voltages (+- 0.01V)
+ const newVoltages = s.cellVoltages.map(v => {
+ const delta = (Math.random() - 0.5) * 0.02;
+ let val = v + delta;
+ if (val < 2.8) val = 2.8;
+ if (val > 3.6) val = 3.6;
+ return val;
+ });
+
+ return {
+ ...s,
+ batteryLevel: newLevel,
+ cellVoltages: newVoltages
+ };
+ });
+ }, 1000);
+ return () => clearInterval(timer);
+ }, []);
diff --git a/commit_msg_2.txt b/commit_msg_2.txt
deleted file mode 100644
index 6f44bca..0000000
--- a/commit_msg_2.txt
+++ /dev/null
@@ -1 +0,0 @@
-Update: Relocate AutoRun controls and cleanup
diff --git a/components/AcsControls.tsx b/components/AcsControls.tsx
index f222716..2058e25 100644
--- a/components/AcsControls.tsx
+++ b/components/AcsControls.tsx
@@ -3,140 +3,167 @@ import { Navigation, Package, Zap, ChevronRight, Hash, Type } from 'lucide-react
import { SimulationMap } from '../types';
interface AcsControlsProps {
- onSend: (cmd: number, data?: number[]) => void;
- isConnected: boolean;
- mapData: SimulationMap;
+ onSend: (cmd: number, data?: number[]) => void;
+ isConnected: boolean;
+ mapData: SimulationMap;
}
const AcsControls: React.FC
= ({ onSend, isConnected, mapData }) => {
- const [tagId, setTagId] = useState('0001');
- const [alias, setAlias] = useState('charger1');
+ const [tagId, setTagId] = useState('0001');
+ const [alias, setAlias] = useState('charger1');
- const PRESET_ALIASES = [
- 'charger1', 'charger2',
- 'loader', 'unloader', 'cleaner',
- 'buffer1', 'buffer2', 'buffer3', 'buffer4', 'buffer5', 'buffer6'
- ];
+ const PRESET_ALIASES = [
+ 'charger1', 'charger2',
+ 'loader', 'unloader', 'cleaner',
+ 'buffer1', 'buffer2', 'buffer3', 'buffer4', 'buffer5', 'buffer6'
+ ];
- const availableTags = useMemo(() => {
- // Extract unique, non-empty RFID tags from map nodes
- const tags = mapData.nodes
- .filter(n => n.rfidId && n.rfidId.trim() !== '')
- .map(n => n.rfidId);
- return Array.from(new Set(tags)).sort();
- }, [mapData]);
+ const availableTags = useMemo(() => {
+ // Extract unique, non-empty RFID tags from map nodes
+ const tags = mapData.nodes
+ .filter(n => n.rfidId && n.rfidId.trim() !== '')
+ .map(n => n.rfidId);
+ return Array.from(new Set(tags)).sort();
+ }, [mapData]);
- const handleSend = (cmd: number, dataStr?: string, dataByte?: number) => {
- if (!isConnected) return;
-
- let payload: number[] = [];
-
- if (dataStr !== undefined) {
- // Convert string to ASCII bytes
- for (let i = 0; i < dataStr.length; i++) {
- payload.push(dataStr.charCodeAt(i));
+ const handleSend = (cmd: number, dataStr?: string, dataByte?: number) => {
+ if (!isConnected) return;
+
+ let payload: number[] = [];
+
+ if (dataStr !== undefined) {
+ // Convert string to ASCII bytes
+ for (let i = 0; i < dataStr.length; i++) {
+ payload.push(dataStr.charCodeAt(i));
+ }
+ } else if (dataByte !== undefined) {
+ payload.push(dataByte);
}
- } else if (dataByte !== undefined) {
- payload.push(dataByte);
- }
- onSend(cmd, payload);
- };
+ onSend(cmd, payload);
+ };
- return (
-
-
- ACS Control
- EXT CMD
-
+ return (
+
+
+ ACS Control
+ EXT CMD
+
- {/* Navigation Commands */}
-
- {/* Goto Tag */}
-
-
-
-
setTagId(e.target.value)}
- className="w-full bg-gray-900 border border-gray-600 rounded py-1 pl-7 pr-2 text-xs text-white font-mono focus:border-green-500 outline-none"
- placeholder="Tag ID"
- />
-
+ {/* Navigation Commands */}
+
+ {/* Goto Tag */}
+
+
+
+ setTagId(e.target.value)}
+ className="w-full bg-gray-900 border border-gray-600 rounded py-1 pl-7 pr-2 text-xs text-white font-mono focus:border-green-500 outline-none"
+ placeholder="Tag ID"
+ />
+
+
+
-
+
+
+
+
+ {/* Action Buttons Grid */}
+
+
+
+
+
+
- {/* Goto Alias */}
-
-
-
-
setAlias(e.target.value)}
- className="w-full bg-gray-900 border border-gray-600 rounded py-1 pl-7 pr-2 text-xs text-white font-mono focus:border-green-500 outline-none"
- placeholder="Alias Name"
- />
-
+ {/* Lift Controls (New) */}
+
+
Lift Control
+
+
+
+
+
+
+
+ {/* System Controls (New) */}
+
+
System Control
+
+
+
+
+
+
Mark Stop
+
+
+
+
-
-
-
-
- {/* Action Buttons Grid */}
-
-
-
-
-
-
-
-
- );
+ );
};
export default AcsControls;
\ No newline at end of file
diff --git a/components/BmsPanel.tsx b/components/BmsPanel.tsx
index 1b4d9fd..b06aeb1 100644
--- a/components/BmsPanel.tsx
+++ b/components/BmsPanel.tsx
@@ -3,86 +3,119 @@ import { BatteryCharging, Zap, Thermometer, Sliders } from 'lucide-react';
import { AgvState } from '../types';
interface BmsPanelProps {
- state: AgvState;
- setBatteryLevel: (level: number) => void;
+ state: AgvState;
+ setBatteryLevel: (level: number) => void;
+ setIsCharging: (isCharging: boolean) => void;
}
-const BmsPanel: React.FC
= ({ state, setBatteryLevel }) => {
- const currentCapacity = (state.maxCapacity * (state.batteryLevel / 100)).toFixed(1);
+const BmsPanel: React.FC = ({ state, setBatteryLevel, setIsCharging }) => {
+ const currentCapacity = (state.maxCapacity * (state.batteryLevel / 100)).toFixed(1);
- return (
-
-
- BMS Monitor
- ID: 01
-
-
- {/* Main Info Grid */}
-
-
-
Total Voltage
-
- {(state.cellVoltages.reduce((a,b)=>a+b, 0)).toFixed(1)} V
-
-
-
-
- Temp
-
-
- {state.batteryTemp.toFixed(1)} °C
-
-
-
-
-
Capacity (Ah)
-
- {currentCapacity}
- /
- {state.maxCapacity}
-
-
-
-
Level (%)
-
- {state.batteryLevel.toFixed(1)}%
+ return (
+
+
+ BMS Monitor
+ ID: 01
+
+
+ {/* Main Info Grid */}
+
+
+
Total Voltage
+
+ {(state.cellVoltages.reduce((a, b) => a + b, 0)).toFixed(1)} V
+
+
+
+
+ Temp 1 / 2
+
+
+
+ 1: {state.batteryTemps?.[0]?.toFixed(1)}°C
+
+
+ 2: {state.batteryTemps?.[1]?.toFixed(1)}°C
+
+
-
-
- {/* Manual Slider */}
-
-
- Manual Adjust
-
-
setBatteryLevel(Number(e.target.value))}
- className="w-full h-1.5 bg-gray-600 rounded-lg appearance-none cursor-pointer accent-green-500 hover:accent-green-400"
- />
-
+
+
Capacity (Ah)
+
+ {currentCapacity}
+ /
+ {state.maxCapacity}
+
+
+
+
Level (%)
+
+ {state.batteryLevel.toFixed(1)}%
+
+
- {/* Cells */}
-
-
Cell Voltages (V)
-
- {state.cellVoltages.map((v, i) => (
-
3.5 ? 'bg-blue-900/30 border-blue-800 text-blue-300' :
- 'bg-gray-700/30 border-gray-600 text-gray-300'
- }`}>
- {v.toFixed(3)}
-
- ))}
-
-
-
- );
+
+
Current (A)
+
+ {(state.isCharging ? -18.7 : 2.1).toFixed(1)} A
+
+
+
+
+
Power (W)
+
+ {state.isCharging ? -450 : 50} W
+
+
+
+
+ {/* Charge Button */}
+
+
+
+
+ {/* Manual Slider */}
+
+
+ Manual Adjust
+
+
setBatteryLevel(Number(e.target.value))}
+ className="w-full h-1.5 bg-gray-600 rounded-lg appearance-none cursor-pointer accent-green-500 hover:accent-green-400"
+ />
+
+
+ {/* Cells */}
+
+
Cell Voltages (V)
+
+ {state.cellVoltages.map((v, i) => (
+
3.5 ? 'bg-blue-900/30 border-blue-800 text-blue-300' :
+ 'bg-gray-700/30 border-gray-600 text-gray-300'
+ }`}>
+ {v.toFixed(3)}
+
+ ))}
+
+
+
+ );
};
export default BmsPanel;
diff --git a/components/SystemLogPanel.tsx b/components/SystemLogPanel.tsx
index ae5b6a6..2581795 100644
--- a/components/SystemLogPanel.tsx
+++ b/components/SystemLogPanel.tsx
@@ -15,7 +15,7 @@ const SystemLogPanel: React.FC
= ({ logs, onClear }) => {
// Force scroll to top
useEffect(() => {
if (logContainerRef.current) {
- logContainerRef.current.scrollTop = 0;
+ logContainerRef.current.scrollTop = 0;
}
}, [reversedLogs]);
@@ -23,44 +23,44 @@ const SystemLogPanel: React.FC = ({ logs, onClear }) => {
{/* Header */}
-
-
- SYSTEM LOG
-
+
+
+
-
+
{/* Log Body */}
-
- {reversedLogs.length === 0 && (
-
- No System Activity
-
- )}
-
- {reversedLogs.map((log, index) => (
-
-
{index + 1}
-
{log.timestamp}
-
+ No System Activity
+
+ )}
+
+ {reversedLogs.map((log, index) => (
+
+ {index + 1}
+ {log.timestamp}
+
- {log.message}
-
-
- ))}
+ {log.message}
+
+
+ ))}