chore: redesign motor page (#78)

* chore: migrate to new motor block packets format

---------

Co-authored-by: Alexandr Motorin <[email protected]>
Co-authored-by: Alexandr <[email protected]>
Co-authored-by: Radomir Epur <[email protected]>

Author: 4 people

lib/app/overlay.dart

@@ -120,7 +120,8 @@ class _OverlayGeneralStatisticsState extends State<OverlayGeneralStatistics> {
                                         text: TextSpan(
                                           children: [
                                             TextSpan(
-                                              text: '${value.speed.value}',
+                                              text:
+                                                  '${value.mergedSpeed.value}',
                                               style: kSpeedTextStyle.copyWith(
                                                 color:
                                                     context.colors.textAccent,
@@ -144,7 +145,7 @@ class _OverlayGeneralStatisticsState extends State<OverlayGeneralStatistics> {
                                 Column(
                                   children: [
                                     Text(
-                                      value.gear.when(
+                                      value.mergedGear.when(
                                         reverse: () =>
                                             context.l10n.reverseGearShort,
                                         neutral: () =>

lib/app/scopes/screens/motor_screen_wrapper.dart

@@ -25,6 +25,7 @@ class MotorScreenWrapper extends StatelessWidget implements AutoRouteWrapper {
                 .subscribeTo(MotorDataCubit.kDefaultSubscribeParameters);
             return MotorDataCubit(
               dataSource: context.read(),
+              motorsCount: context.read<HardwareCount>().motors,
             );
           },
         ),

lib/data/services/data_source/demo_data_source.dart

@@ -8,9 +8,7 @@ import 'package:pixel_app_flutter/data/services/data_source/mixins/package_strea
 import 'package:pixel_app_flutter/data/services/data_source/mixins/parse_bytes_package_mixin.dart';
 import 'package:pixel_app_flutter/data/services/data_source/mixins/send_packages_mixin.dart';
 import 'package:pixel_app_flutter/domain/data_source/data_source.dart';
-import 'package:pixel_app_flutter/domain/data_source/models/package/outgoing/authorizartion.dart';
 import 'package:pixel_app_flutter/domain/data_source/models/package/outgoing/outgoing_data_source_packages.dart';
-import 'package:pixel_app_flutter/domain/data_source/models/package_data/implementations/battery_percent.dart';
 import 'package:pixel_app_flutter/domain/data_source/models/package_data/package_data.dart';
 import 'package:re_seedwork/re_seedwork.dart';
 
@@ -286,30 +284,81 @@ class DemoDataSource extends DataSource
   @visibleForTesting
   List<MainEcuMockResponse> get mockedResponses => [
         MainEcuMockResponseUpdateCallbackWrapper(
-          ids: {const DataSourceParameterId.motorSpeed()},
+          ids: {
+            const DataSourceParameterId.motorSpeed1(),
+            const DataSourceParameterId.motorSpeed2(),
+            const DataSourceParameterId.motorSpeed3(),
+            const DataSourceParameterId.motorSpeed4(),
+          },
           convertible: TwoUint16WithStatusBody(
             status: _getRandomStatus,
             first: Random().nextInt(1001),
             second: Random().nextInt(1001),
           ),
         ),
         MainEcuMockResponseWrapper(
-          ids: {const DataSourceParameterId.motorVoltage()},
+          ids: {
+            const DataSourceParameterId.motorVoltage1(),
+            const DataSourceParameterId.motorVoltage2(),
+            const DataSourceParameterId.motorVoltage3(),
+            const DataSourceParameterId.motorVoltage4(),
+            const DataSourceParameterId.rpm1(),
+            const DataSourceParameterId.rpm2(),
+            const DataSourceParameterId.rpm3(),
+            const DataSourceParameterId.rpm4(),
+          },
           respondCallback: (id, version, _, [__]) => _sendTwoUint16Callback(
             id,
             version,
           ),
         ),
         MainEcuMockResponseWrapper(
           ids: {
-            const DataSourceParameterId.motorCurrent(),
-            const DataSourceParameterId.motorPower(),
+            const DataSourceParameterId.motorCurrent1(),
+            const DataSourceParameterId.motorCurrent2(),
+            const DataSourceParameterId.motorCurrent3(),
+            const DataSourceParameterId.motorCurrent4(),
+            const DataSourceParameterId.motorPower1(),
+            const DataSourceParameterId.motorPower2(),
+            const DataSourceParameterId.motorPower3(),
+            const DataSourceParameterId.motorPower4(),
+            const DataSourceParameterId.motorTemperature1(),
+            const DataSourceParameterId.motorTemperature2(),
+            const DataSourceParameterId.motorTemperature3(),
+            const DataSourceParameterId.motorTemperature4(),
+            const DataSourceParameterId.controllerTemperature1(),
+            const DataSourceParameterId.controllerTemperature2(),
+            const DataSourceParameterId.controllerTemperature3(),
+            const DataSourceParameterId.controllerTemperature4(),
           },
           respondCallback: (id, version, _, [__]) => _sendTwoInt16Callback(
             id,
             version,
           ),
         ),
+        MainEcuMockResponseWrapper(
+          ids: {
+            const DataSourceParameterId.gearAndRoll1(),
+            const DataSourceParameterId.gearAndRoll2(),
+            const DataSourceParameterId.gearAndRoll3(),
+            const DataSourceParameterId.gearAndRoll4(),
+          },
+          respondCallback: (id, version, manager, [package]) {
+            final randomGear =
+                MotorGear.values[Random().nextInt(MotorGear.values.length)];
+            final randomRoll = MotorRollDirection
+                .values[Random().nextInt(MotorRollDirection.values.length)];
+            return manager.updateCallback(
+              id,
+              MotorGearAndRoll(
+                gear: randomGear,
+                rollDirection: randomRoll,
+                status: _getRandomStatus,
+              ),
+              version,
+            );
+          },
+        ),
         MainEcuMockResponseWrapper(
           ids: {
             const DataSourceParameterId.temperature1(),
@@ -404,6 +453,19 @@ class DemoDataSource extends DataSource
             version,
           ),
         ),
+        MainEcuMockResponseWrapper(
+          ids: {const DataSourceParameterId.odometer()},
+          respondCallback: (id, version, manager, [package]) {
+            return manager.updateCallback(
+              id,
+              Uint32WithStatusBody(
+                status: _getRandomStatus,
+                value: Random().nextInt(0xFFFFFFFF),
+              ),
+              version,
+            );
+          },
+        ),
         MainEcuMockResponseUpdateCallbackWrapper(
           ids: {
             const DataSourceParameterId.maxTemperature1(),
@@ -615,18 +677,18 @@ class DemoDataSource extends DataSource
   bool get randomBool => Random().nextBool();
 
   int get randomUint8 => Random().nextInt(0xFF);
+
   int get randomUint16 => Random().nextInt(0xFFFF);
+
   int get randomInt16 => Random().nextInt(0x8000).randomSign;
 
   double get randomDoubleUint16 => Random().nextDouble() * 0xFFFF;
-  double get randomDoubleUint32 => Random().nextDouble() * 0xFFFFFFFF;
 
   Result<SendPackageError, void> _updateValueCallback(
     DataSourceParameterId parameterId,
     BytesConvertible convertible,
-    DataSourceProtocolVersion version, [
-    DataSourceOutgoingPackage? package,
-  ]) {
+    DataSourceProtocolVersion version,
+  ) {
     final requestType = version.when(
       subscription: () => 0x95, //'10010101'
       periodicRequests: () => 0x81, //'10000001'
@@ -677,9 +739,8 @@ final class MainEcuMockManager {
   final Result<SendPackageError, void> Function(
     DataSourceParameterId parameterId,
     BytesConvertible convertible,
-    DataSourceProtocolVersion version, [
-    DataSourceOutgoingPackage? package,
-  ]) updateCallback;
+    DataSourceProtocolVersion version,
+  ) updateCallback;
 
   bool checkAvailableForSubscription(DataSourceParameterId id) {
     return mockedResponses.any(
@@ -798,6 +859,6 @@ final class MainEcuMockResponseUpdateCallbackWrapper
     MainEcuMockManager manager, [
     DataSourceOutgoingPackage? package,
   ]) {
-    return manager.updateCallback(id, convertible, version, package);
+    return manager.updateCallback(id, convertible, version);
   }
 }

lib/domain/data_source/blocs/data_source_authorization_cubit.dart

@@ -4,7 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:pixel_app_flutter/domain/data_source/data_source.dart';
 import 'package:pixel_app_flutter/domain/data_source/models/package/incoming/incoming_data_source_packages.dart';
-import 'package:pixel_app_flutter/domain/data_source/models/package/outgoing/authorizartion.dart';
+import 'package:pixel_app_flutter/domain/data_source/models/package/outgoing/outgoing_data_source_packages.dart';
 import 'package:pixel_app_flutter/domain/data_source/models/package_data/package_data.dart';
 
 part 'data_source_authorization_cubit.freezed.dart';