Added Bike Battery

.gitattributes

@@ -0,0 +1 @@
+* text=auto

lib/bike.dart

@@ -66,7 +66,7 @@ class Bike extends _$Bike {
       _resetReadTimer();
       var data = await ref
           .read(bluetoothRepositoryProvider)
-          .readCurrentState(state.id);
+          .readCurrentState(state.id, 'SETTING');
       if (data == null || data.isEmpty) {
         return;
       }
@@ -87,10 +87,27 @@ class Bike extends _$Bike {
         newState = newState.copyWith(assist: state.assist);
       }
       writeStateData(newState);
+
+      // Read the ride state to update the battery level
+      var rideData = await ref
+          .read(bluetoothRepositoryProvider)
+          .readCurrentState(state.id, 'RIDE');
+      if (rideData != null && rideData.isNotEmpty) {
+        //update Battery State
+        state = newState.updateRideFromData(rideData);
+      }
+      // Read the ride state to update the battery level
+      var totalData = await ref
+          .read(bluetoothRepositoryProvider)
+          .readCurrentState(state.id, 'TOTAL');
+      if (totalData != null && totalData.isNotEmpty) {
+        //update Battery State
+        state = newState.updateTotalFromData(totalData);
+      }
     });
   }
 
-  void writeStateData(BikeState newState, {saveToBike = true}) async {
+  void writeStateData(BikeState newState, {bool saveToBike = true}) async {
     _resetDebounce();
     if (state.id != newState.id) {
       throw Exception('Bike id mismatch');
@@ -235,9 +252,8 @@ class BikePageState extends ConsumerState<BikePage> {
                     mainAxisAlignment: MainAxisAlignment.end,
                     children: [ConnectionWidget(bike: bike)],
                   ),
-                  LightControlWidget(
-                    bike: bike,
-                  ),
+                  BatteryODOControlWidget(bike: bike),
+                  LightControlWidget(bike: bike),
                   ModeControlWidget(bike: bike),
                   AssistControlWidget(bike: bike),
                   if (Platform.isAndroid)
@@ -292,8 +308,7 @@ class ConnectionWidget extends ConsumerWidget {
     if (connectionStatus == BluetoothConnectionState.connected) {
       text = 'Connected';
       disabled = true;
-    } else if (connectionStatus == BluetoothConnectionState.disconnected &&
-        !isScanning) {
+    } else if (connectionStatus == BluetoothConnectionState.disconnected && !isScanning) {
       text = 'Connect';
       disabled = false;
     }
@@ -327,6 +342,66 @@ class LockWidget extends StatelessWidget {
     );
   }
 }
+class BatteryODOControlWidget extends ConsumerWidget {
+  const BatteryODOControlWidget({super.key, required this.bike});
+  final BikeState bike;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    var bikeControl = ref.watch(bikeProvider(bike.id).notifier);
+    return Padding(
+      padding: const EdgeInsets.only(top: 20.0),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Expanded(
+            child: DiscoverCard(
+              colorIndex: bike.color,
+              title: "",
+              metric: bike.speedMetric == 'metric'
+                  ? '${bike.odometer.toStringAsFixed(0)} km'
+                  : '${(bike.odometer * 0.621371).toStringAsFixed(0)} mi',
+              titleIcon: Icons.pedal_bike,
+              selected: false,
+              onTap: () {
+                final newMetric = bike.speedMetric == 'metric' ? 'imperial' : 'metric';
+                bikeControl.writeStateData(bike.copyWith(speedMetric: newMetric), saveToBike: false);
+              },
+            ),
+          ),
+          SizedBox(width: 16.0), // Add padding between the cards
+          Expanded(
+            child: DiscoverCard(
+              height: 2,
+              colorIndex: bike.color,
+              title: "",
+              metric: '${bike.battery.toDouble()} %',
+              titleIcon: _getBatteryIcon(bike.battery),
+              selected: false,
+              onTap: () {
+                //todo: show battery info
+              },
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+IconData _getBatteryIcon(double batteryPercentage) {
+  return switch (batteryPercentage) {
+    >= 95 => Icons.battery_full,
+    >= 80 => Icons.battery_6_bar,
+    >= 60 => Icons.battery_5_bar,
+    >= 50 => Icons.battery_4_bar,
+    >= 35 => Icons.battery_3_bar,
+    >= 20 => Icons.battery_2_bar,
+    >= 5 => Icons.battery_1_bar,
+    >= 0 => Icons.battery_0_bar,
+    _ => Icons.battery_alert,
+  };
+}
 
 class LightControlWidget extends ConsumerWidget {
   const LightControlWidget({super.key, required this.bike});

lib/debug.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:superduper/help.dart';
+import 'dart:math';
 
 import 'bike.dart';
 import 'edit_bike.dart';
@@ -41,7 +42,7 @@ class DebugPage extends StatelessWidget {
                   context: context,
                   builder: (BuildContext context) {
                     return BikeSettingsWidget(
-                        bike: BikeState.defaultState('1'));
+                        bike: BikeState.defaultState(generateRandomMacAddress()));
                   });
             },
             child: const Text('Form'),
@@ -50,4 +51,14 @@ class DebugPage extends StatelessWidget {
       ),
     );
   }
+
+  String generateRandomMacAddress() {
+    final Random random = Random();
+    return '${_randomHex(random)}:${_randomHex(random)}:${_randomHex(random)}:${_randomHex(random)}:${_randomHex(random)}:${_randomHex(random)}';
+  }
+
+  String _randomHex(Random random) {
+    return random.nextInt(16).toRadixString(16).padLeft(2, '0');
+  }
+
 }

lib/models.dart

@@ -24,6 +24,10 @@ class BikeState with _$BikeState {
   @Assert('assist >= 0')
   @Assert('assist <= 4')
   @Assert('color >= 0')
+  @Assert('battery >= 0')
+  @Assert('battery <= 100')
+  @Assert('odometer >= 0')
+  @Assert('speedMetric == "metric" || speedMetric == "imperial"')
   const factory BikeState(
       {required String id,
       required int mode,
@@ -35,14 +39,18 @@ class BikeState with _$BikeState {
       required String name,
       BikeRegion? region,
       @Default(false) bool modeLock,
-      @Default(0) int color}) = _BikeState;
+      @Default(0) int color,
+      @Default(0.0) double battery,
+      @Default(0) double odometer,
+      @Default('metric') String speedMetric
+      }) = _BikeState;
 
   factory BikeState.fromJson(Map<String, Object?> json) =>
       _$BikeStateFromJson(json);
 
   factory BikeState.defaultState(String id) {
     return BikeState(
-        id: id, mode: 0, light: false, assist: 0, name: getName(seed: id));
+        id: id, mode: 0, light: false, assist: 0, name: getName(seed: id), battery: 0.0, odometer: 0);
   }
 
   BikeState updateFromData(List<int> data) {
@@ -58,6 +66,20 @@ class BikeState with _$BikeState {
         region: region);
   }
 
+  BikeState updateRideFromData(List<int> data) {
+    const cadenceIdx = 3;
+    const rangeIdx = 8;
+    final batteryPercentage = _batteryPercentage(data[rangeIdx]);
+    return copyWith(battery: batteryPercentage);
+  }
+
+  BikeState updateTotalFromData(List<int> data) {
+    const total1Idx = 6;
+    const total2Idx = 7;
+    final totalodometer = _getodometer(data[total1Idx], data[total2Idx]);
+    return copyWith(odometer: totalodometer);
+  }
+
   BikeRegion _guessRegion(int mode) {
     if (region != null) {
       return region!;
@@ -90,6 +112,16 @@ class BikeState with _$BikeState {
     return (mode + 1) % 4;
   }
 
+  double _getodometer(int total1, int total2) {
+    return (((total2 * 256) + total1) / 10);
+  }
+
+  double _batteryPercentage(int range) {
+    // All current Super73 max range is 60km
+    double batteryPercentage = range / 60.0 * 100;
+    return double.parse(batteryPercentage.toStringAsFixed(1));
+  }
+
   List<int> toWriteData() {
     return [0, 209, light ? 1 : 0, assist, _modeToWrite(), 0, 0, 0, 0, 0];
   }