From 243add9dc38ace40398c22864055a741582467b2 Mon Sep 17 00:00:00 2001
From: kleponijo <posapaaja@gmail.com>
Date: Sun, 5 Jul 2026 07:39:30 +0700
Subject: [PATCH] oke

---
 .../device_setup/views/device_setup_wind_speed_screen.dart   | 2 ++
 lib/screens/monitoring/wind_speed/blocs/wind_speed_bloc.dart | 4 ++--
 .../monitoring/wind_speed/views/wind_speed_screen.dart       | 5 -----
 .../monitoring_repository/lib/src/models/wind_speed.dart     | 5 ++++-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/screens/monitoring/device_setup/views/device_setup_wind_speed_screen.dart b/lib/screens/monitoring/device_setup/views/device_setup_wind_speed_screen.dart
index cacced4..b387955 100644
--- a/lib/screens/monitoring/device_setup/views/device_setup_wind_speed_screen.dart
+++ b/lib/screens/monitoring/device_setup/views/device_setup_wind_speed_screen.dart
@@ -23,6 +23,7 @@ const _kAverageOptions = <String, int>{
   '30 detik': 30000,
   '1 menit': 60000,
   '5 menit': 300000,
+  '6 menit': 360000,
   '10 menit': 600000,
   '30 menit': 1800000,
 };
@@ -31,6 +32,7 @@ const _kAverageOptions = <String, int>{
 const _kHistoryOptions = <String, int>{
   '30 detik': 30000,
   '1 menit': 60000,
+  '6 menit': 360000,
   '10 menit': 600000,
   '30 menit': 1800000,
   '1 jam': 3600000,
diff --git a/lib/screens/monitoring/wind_speed/blocs/wind_speed_bloc.dart b/lib/screens/monitoring/wind_speed/blocs/wind_speed_bloc.dart
index 3f83bd0..03d41e5 100644
--- a/lib/screens/monitoring/wind_speed/blocs/wind_speed_bloc.dart
+++ b/lib/screens/monitoring/wind_speed/blocs/wind_speed_bloc.dart
@@ -423,10 +423,10 @@ class WindSpeedBloc extends Bloc<WindSpeedEvent, WindSpeedState> {
 
     if (speed >= _kWindDanger) {
       severity = AlertSeverity.danger;
-      message = 'Kecepatan angin ${speed.toStringAsFixed(1)} m/s — BAHAYA';
+      message = 'Kecepatan angin ${speed.toStringAsFixed(1)} km/h — BAHAYA';
     } else if (speed >= _kWindWarning) {
       severity = AlertSeverity.warning;
-      message = 'Kecepatan angin ${speed.toStringAsFixed(1)} m/s — waspada';
+      message = 'Kecepatan angin ${speed.toStringAsFixed(1)} km/h — waspada';
     } else {
       severity = AlertSeverity.info;
       message = '';
diff --git a/lib/screens/monitoring/wind_speed/views/wind_speed_screen.dart b/lib/screens/monitoring/wind_speed/views/wind_speed_screen.dart
index 89ace8e..94d719f 100644
--- a/lib/screens/monitoring/wind_speed/views/wind_speed_screen.dart
+++ b/lib/screens/monitoring/wind_speed/views/wind_speed_screen.dart
@@ -758,11 +758,6 @@ class _WindSpeedScreenState extends State<WindSpeedScreen> {
           const Text('km/h',
               style: TextStyle(fontSize: 20, color: Colors.white70)),
           const SizedBox(height: 4),
-          Text(
-            '${(speed / 3.6).toStringAsFixed(3)} m/s',
-            style: const TextStyle(fontSize: 14, color: Colors.white54),
-          ),
-          const SizedBox(height: 14),
           Container(
             padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 7),
             decoration: BoxDecoration(
diff --git a/packages/monitoring_repository/lib/src/models/wind_speed.dart b/packages/monitoring_repository/lib/src/models/wind_speed.dart
index 2bb90e3..0a5ac97 100644
--- a/packages/monitoring_repository/lib/src/models/wind_speed.dart
+++ b/packages/monitoring_repository/lib/src/models/wind_speed.dart
@@ -1,5 +1,6 @@
 class MyWindSpeed {
   final double windwegKm;
+  final double speedKmh;
   final double totalWindwegKm;
   final double maxWindwegKm;
   final int totalPulse;
@@ -8,6 +9,7 @@ class MyWindSpeed {
 
   MyWindSpeed({
     required this.windwegKm,
+    this.speedKmh = 0.0,
     this.totalWindwegKm = 0.0,
     this.maxWindwegKm = 0.0,
     this.totalPulse = 0,
@@ -16,7 +18,7 @@ class MyWindSpeed {
   });
 
   // Getter alias untuk kompatibilitas dengan bloc/chart yang pakai .speed
-  double get speed => windwegKm;
+  double get speed => speedKmh;
   double get maxSpeed => maxWindwegKm;
 
   static final empty = MyWindSpeed(
@@ -33,6 +35,7 @@ class MyWindSpeed {
                   json['speed'] ??
                   0))
               .toDouble(),
+      speedKmh: (json['speed_kmh'] ?? 0).toDouble(),
       totalWindwegKm: (json['total_windweg_km'] ?? 0).toDouble(),
       maxWindwegKm: (json['max_windweg_km'] ?? 0).toDouble(),
       totalPulse: (json['total_pulse'] ?? 0) as int,