@@ -5,7 +5,6 @@ import 'package:pixel_app_flutter/domain/app/app.dart';
5
5
import 'package:pixel_app_flutter/domain/data_source/data_source.dart' ;
6
6
import 'package:pixel_app_flutter/domain/data_source/models/package/incoming/battery_percent.dart' ;
7
7
import 'package:pixel_app_flutter/domain/data_source/models/package/incoming/incoming_data_source_packages.dart' ;
8
- import 'package:pixel_app_flutter/domain/data_source/models/package/incoming/wheelSteering.dart' ;
9
8
import 'package:pixel_app_flutter/domain/data_source/models/package_data/package_data.dart' ;
10
9
import 'package:re_seedwork/re_seedwork.dart' ;
11
10
@@ -16,7 +15,6 @@ typedef _IntValueModifier = (
16
15
17
16
extension _SequenceExt on Sequence <IntWithStatus > {
18
17
static int avgFold (int a, int b) => a + b;
19
-
20
18
static int maxFold (int a, int b) => a > b ? a : b;
21
19
22
20
static _IntValueModifier avg =
@@ -52,7 +50,6 @@ final class GeneralDataState with EquatableMixin {
52
50
required this .odometer,
53
51
required this .speed,
54
52
required this .gear,
55
- required this .wheelSteering,
56
53
});
57
54
58
55
GeneralDataState .initial ({
@@ -73,8 +70,7 @@ final class GeneralDataState with EquatableMixin {
73
70
gear = Sequence .fill (
74
71
hardwareCount.motors,
75
72
MotorGear .unknown,
76
- ),
77
- wheelSteering = WheelSteering .free;
73
+ );
78
74
79
75
factory GeneralDataState .fromMap (Map <String , dynamic > map) {
80
76
return GeneralDataState (
@@ -92,7 +88,6 @@ final class GeneralDataState with EquatableMixin {
92
88
gear: Sequence .fromIterable (
93
89
map.tryParseAndMapList ('gear' , MotorGear .fromId),
94
90
),
95
- wheelSteering: map.parseAndMap ('wheelSteering' , WheelSteering .fromId),
96
91
);
97
92
}
98
93
@@ -102,7 +97,6 @@ final class GeneralDataState with EquatableMixin {
102
97
final Sequence <IntWithStatus > speed;
103
98
final Sequence <MotorGear > gear;
104
99
final Sequence <IntWithStatus > batteryPercent;
105
- final WheelSteering wheelSteering;
106
100
107
101
// TODO(Radomir): hardcoded temporarily because there is only one battery
108
102
// at the moment, and the merged value(mean) is irrelevant
@@ -126,16 +120,20 @@ final class GeneralDataState with EquatableMixin {
126
120
}
127
121
128
122
@override
129
- List <Object ?> get props =>
130
- [power, batteryPercent, odometer, speed, gear, wheelSteering];
123
+ List <Object ?> get props => [
124
+ power,
125
+ batteryPercent,
126
+ odometer,
127
+ speed,
128
+ gear,
129
+ ];
131
130
132
131
GeneralDataState copyWith ({
133
132
Sequence <IntWithStatus >? power,
134
133
Sequence <IntWithStatus >? batteryPercent,
135
134
IntWithStatus ? odometer,
136
135
Sequence <IntWithStatus >? speed,
137
136
Sequence <MotorGear >? gear,
138
- WheelSteering ? wheelSteering,
139
137
}) {
140
138
return GeneralDataState (
141
139
hardwareCount: hardwareCount,
@@ -144,7 +142,6 @@ final class GeneralDataState with EquatableMixin {
144
142
odometer: odometer ?? this .odometer,
145
143
speed: speed ?? this .speed,
146
144
gear: gear ?? this .gear,
147
- wheelSteering: wheelSteering ?? this .wheelSteering,
148
145
);
149
146
}
150
147
@@ -156,7 +153,6 @@ final class GeneralDataState with EquatableMixin {
156
153
'odometer' : odometer.toMap (),
157
154
'speed' : [for (final e in speed) e.toMap ()],
158
155
'gear' : [for (final e in gear) e.id],
159
- 'wheelSteering' : wheelSteering.id,
160
156
};
161
157
}
162
158
}
@@ -220,14 +216,6 @@ class GeneralDataCubit extends Cubit<GeneralDataState> with ConsumerBlocMixin {
220
216
odometer: IntWithStatus .fromBytesConvertible (model, km),
221
217
),
222
218
);
223
- })
224
- ..voidOnModel< Uint8WithStatusBody ,
225
- WheelSteeringIncomingDataSourcePackage > ((model) {
226
- emit (
227
- state.copyWith (
228
- wheelSteering: WheelSteering .fromId (model.value) ,
229
- ),
230
- );
231
219
});
232
220
});
233
221
}
@@ -246,7 +234,6 @@ class GeneralDataCubit extends Cubit<GeneralDataState> with ConsumerBlocMixin {
246
234
const DataSourceParameterId .batteryPercent2 (),
247
235
const DataSourceParameterId .batteryPower1 (),
248
236
const DataSourceParameterId .batteryPower2 (),
249
- const DataSourceParameterId .wheelSteering (),
250
237
};
251
238
252
239
@protected
0 commit comments