Handlebar warning (#91)

* warn of incorrectly (un)locked handlebars. untested. * Shortening wait (from 3000 seconds lol) and fixing boolean mixup
reunu · Dec 17, 2024 · 7ba1af5 · 7ba1af5
1 parent 3944c75
commit 7ba1af5
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 6 deletions.
diff --git a/assets/anim/handlebars.json b/assets/anim/handlebars.json
diff --git a/assets/i18n/de.json b/assets/i18n/de.json
@@ -36,6 +36,12 @@
     "home_reconnect_button": "Suchen",
     "seat_alert_title": "Sitzbank offen!",
     "seat_alert_body": "Aus Sicherheitsgründen kann der Roller nicht verriegelt werden, so lange die Sitzbank offen ist.",
+    "locked_handlebar_alert_title": "Lenker ist noch verriegelt!",
+    "locked_handlebar_alert_body": "Dreh den Lenker ganz nach links, und starte dann den Roller neu.",
+    "locked_handlebar_alert_action": "Roller ausschalten",
+    "unlocked_handlebar_alert_title": "Lenker ist nicht verriegelt!",
+    "unlocked_handlebar_alert_body": "Dreh den Lenker ganz nach links, und starte dann den Roller neu.",
+    "unlocked_handlebar_alert_action": "Roller einschalten",
     "state_name_standby": "Standby",
     "state_name_off": "Ausgeschaltet",
     "state_name_parked": "Geparkt",

diff --git a/assets/i18n/en.json b/assets/i18n/en.json
@@ -36,6 +36,12 @@
     "home_reconnect_button": "Reconnect",
     "seat_alert_title": "Seat is open!",
     "seat_alert_body": "For safety reasons, the scooter can't be locked while the seat is open.",
+    "locked_handlebar_alert_title": "Handlebars are still locked!",
+    "locked_handlebar_alert_body": "Push your handlebars all the way to the left, and start the scooter again.",
+    "locked_handlebar_alert_action": "Turn off scooter",
+    "unlocked_handlebar_alert_title": "Handlebars did not lock!",
+    "unlocked_handlebar_alert_body": "Turn your handlebars all the way to the left, and lock the scooter again.",
+    "unlocked_handlebar_alert_action": "Turn on scooter",
     "state_name_standby": "Standby",
     "state_name_off": "Powered off",
     "state_name_parked": "Parked",

diff --git a/assets/i18n/pi.json b/assets/i18n/pi.json
@@ -36,6 +36,12 @@
     "home_reconnect_button": "Reconnect",
     "seat_alert_title": "Arrr! The treasure chest be open!",
     "seat_alert_body": "Avast ye! Fer safety reasons, ye can't be lockin' the treasure chest while it be open, arrr!",
+    "locked_handlebar_alert_title": "Avast! Yar helm be locked!",
+    "locked_handlebar_alert_body": "Turn ye helm all the way to the left, and restart ye ship.",
+    "locked_handlebar_alert_action": "Power down ship",
+    "unlocked_handlebar_alert_title": "Yar helm ain't secured!",
+    "unlocked_handlebar_alert_body": "Turn ye helm all the way to the left, and secure ye ship again.",
+    "unlocked_handlebar_alert_action": "Power up ship",
     "state_name_standby": "Sleepin' like a drunken sailor",
     "state_name_off": "Powered off, like a sunken ship",
     "state_name_parked": "Docked and ready for plunderin'",

diff --git a/lib/home_screen.dart b/lib/home_screen.dart
@@ -7,6 +7,7 @@ import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:logging/logging.dart';
+import 'package:lottie/lottie.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../control_screen.dart';
@@ -359,6 +360,12 @@ class _HomeScreenState extends State<HomeScreen> {
                                               log.warning(
                                                   "Seat is open, showing alert");
                                               showSeatWarning();
+                                            } on HandlebarLockException catch (_) {
+                                              log.warning(
+                                                  "Handlebars are still unlocked, showing alert");
+                                              showHandlebarWarning(
+                                                didNotUnlock: false,
+                                              );
                                             } catch (e, stack) {
                                               log.severe(
                                                   "Problem opening the seat",
@@ -369,11 +376,20 @@ class _HomeScreenState extends State<HomeScreen> {
                                             }
                                           }
                                         : (_scooterState == ScooterState.standby
-                                            ? () {
-                                                widget.scooterService.unlock();
-                                                if (widget.scooterService
-                                                    .hazardLocking) {
-                                                  _flashHazards(2);
+                                            ? () async {
+                                                try {
+                                                  await widget.scooterService
+                                                      .unlock();
+                                                  if (widget.scooterService
+                                                      .hazardLocking) {
+                                                    _flashHazards(2);
+                                                  }
+                                                } on HandlebarLockException catch (_) {
+                                                  log.warning(
+                                                      "Handlebars are still locked, showing alert");
+                                                  showHandlebarWarning(
+                                                    didNotUnlock: true,
+                                                  );
                                                 }
                                               }
                                             : widget.scooterService
@@ -470,6 +486,57 @@ class _HomeScreenState extends State<HomeScreen> {
     );
   }
 
+  void showHandlebarWarning({required bool didNotUnlock}) {
+    showDialog<void>(
+      context: context,
+      barrierDismissible: false, // user must tap button!
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Lottie.asset(
+                "assets/anim/handlebars.json",
+                height: 160,
+              ),
+              const SizedBox(height: 24),
+              Text(FlutterI18n.translate(context,
+                  "${didNotUnlock ? "locked" : "unlocked"}_handlebar_alert_title")),
+            ],
+          ),
+          content: SingleChildScrollView(
+            child: ListBody(
+              children: <Widget>[
+                Text(FlutterI18n.translate(context,
+                    "${didNotUnlock ? "locked" : "unlocked"}_handlebar_alert_body")),
+              ],
+            ),
+          ),
+          actions: <Widget>[
+            TextButton(
+              child: const Text('OK'),
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+            ),
+            TextButton(
+              child: Text(FlutterI18n.translate(context,
+                  "${didNotUnlock ? "locked" : "unlocked"}_handlebar_alert_action")),
+              onPressed: () {
+                if (didNotUnlock) {
+                  widget.scooterService.lock();
+                } else {
+                  widget.scooterService.unlock();
+                }
+                Navigator.of(context).pop();
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
+
   void redirectOrStart() async {
     List<String> ids = await widget.scooterService.getSavedScooterIds();
     log.info("Saved scooters: $ids");

diff --git a/lib/scooter_service.dart b/lib/scooter_service.dart
@@ -523,7 +523,7 @@ class ScooterService {
 
   // SCOOTER ACTIONS
 
-  void unlock() {
+  Future<void> unlock() async {
     _sendCommand("scooter:state unlock");
     HapticFeedback.heavyImpact();
 
@@ -534,6 +534,13 @@ class ScooterService {
     if (_openSeatOnUnlock) {
       openSeat();
     }
+
+    await Future.delayed(const Duration(seconds: 2), () {
+      if (_handlebarController.value == true) {
+        log.warning("Handlebars didn't unlock, sending warning");
+        throw HandlebarLockException();
+      }
+    });
   }
 
   Future<void> wakeUpAndUnlock() async {
@@ -548,6 +555,7 @@ class ScooterService {
   }
 
   Future<void> lock() async {
+    // double-check for open seat
     if (_seatClosedController.value == false) {
       log.warning("Seat seems to be open, checking again...");
       // make really sure nothing has changed
@@ -560,13 +568,22 @@ class ScooterService {
             "Seat state was ${_seatClosedController.value} this time, proceeding...");
       }
     }
+
+    // send the command
     _sendCommand("scooter:state lock");
     HapticFeedback.heavyImpact();
 
     if (_hazardLocking) {
       hazard(times: 1);
     }
 
+    await Future.delayed(const Duration(seconds: 2), () {
+      if (_handlebarController.value == false) {
+        log.warning("Handlebars didn't lock, sending warning");
+        throw HandlebarLockException();
+      }
+    });
+
     // don't immediately unlock again automatically
     _autoUnlockCooldown = true;
     await _sleepSeconds(keylessCooldownSeconds.toDouble());
@@ -900,3 +917,5 @@ class ScooterService {
 class SeatOpenException {}
 
 class UnavailableCharacteristicsException {}
+
+class HandlebarLockException {}
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -142,6 +142,7 @@ flutter:
     - assets/faq_pi.json
     - assets/anim/scanning.json
     - assets/anim/found.json
+    - assets/anim/handlebars.json
 
   fonts:
     - family: icomoon