Skip to content

Commit a9bb68a

Browse files
authored
Merge pull request #3 from Kamoool/Dropdown_show_port_description
Dropdown show port description
2 parents 168a3e3 + 00ca4c4 commit a9bb68a

4 files changed

Lines changed: 15 additions & 21 deletions

File tree

lib/model/serial_utils.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import 'dart:io';
21
import 'dart:typed_data';
32
import 'package:flutter_libserialport/flutter_libserialport.dart';
43
import 'package:qs_ds_app/model/settings_repository.dart';

lib/model/settings_repository.dart

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,10 @@ class SettingsRepository {
133133
List<String> values = string.split(',');
134134
if (values[0] == 'V' && values.length == readingsList.length + 1) {
135135
for (int i = 1; i < values.length; i++) {
136-
// if(i == values.length - 1){
137-
// values[i] = values[i].substring(0, values[i].length - 1);
138-
// }
139136
readingsList[i - 1].value = values[i];
140137
}
141138
} else if (values[0] == 'T' && values.length == settingsList.length + 1) {
142139
for (int i = 1; i < values.length; i++) {
143-
// if(i == values.length - 1){
144-
// values[i] = values[i].substring(0, values[i].length - 1);
145-
// }
146140
settingsList[i - 1].value = values[i];
147141
}
148142
}
@@ -159,9 +153,6 @@ class SettingsRepository {
159153

160154
List<Tab> getTabs() {
161155
List<Tab> tabs = <Tab>[];
162-
// tabs.add(Tab(text: 'Quickshifter',));
163-
// tabs.add(Tab(text: 'Downshifter',));
164-
// return tabs;
165156
if (qsType.value != '0' || dsType.value != '0') {
166157
tabs.add(const Tab(
167158
text: 'General',

lib/screens/port_screen.dart

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class PortScreen extends StatefulWidget {
1717
class _PortScreenState extends State<PortScreen>
1818
with SingleTickerProviderStateMixin {
1919
final ScrollController scrollControllerHorizontal = ScrollController();
20-
String? dropdownValue;
21-
List<String> availablePorts = [];
20+
SerialPort? dropdownValue;
21+
List<SerialPort> availablePorts = [];
2222
late AnimationController animationController;
2323
bool refreshPressed = false;
2424

@@ -35,7 +35,10 @@ class _PortScreenState extends State<PortScreen>
3535

3636
void initPorts() {
3737
setState(() {
38-
availablePorts = SerialPort.availablePorts;
38+
availablePorts.clear();
39+
for (final address in SerialPort.availablePorts) {
40+
availablePorts.add(SerialPort(address));
41+
}
3942
dropdownValue = null;
4043
});
4144
}
@@ -123,10 +126,10 @@ class _PortScreenState extends State<PortScreen>
123126
],
124127
),
125128
items: availablePorts
126-
.map((item) => DropdownMenuItem<String>(
129+
.map((item) => DropdownMenuItem<SerialPort>(
127130
value: item,
128131
child: Text(
129-
item,
132+
item.description ?? 'Unknown',
130133
style: const TextStyle(
131134
fontSize: 20,
132135
color: Colors.black,
@@ -136,9 +139,9 @@ class _PortScreenState extends State<PortScreen>
136139
))
137140
.toList(),
138141
value: dropdownValue,
139-
onChanged: (String? value) {
142+
onChanged: (SerialPort? value) {
140143
setState(() {
141-
dropdownValue = value ?? '';
144+
dropdownValue = value ?? SerialPort('COM0');
142145
});
143146
},
144147
icon: const Icon(
@@ -233,9 +236,10 @@ class _PortScreenState extends State<PortScreen>
233236

234237
Future<void> establishConnection() async {
235238
if (dropdownValue != null) {
236-
SerialPortUtils(serialPort: SerialPort(dropdownValue ?? 'COM0'));
237-
Navigator.push(
239+
SerialPortUtils(serialPort: dropdownValue);
240+
await Navigator.push(
238241
context, MaterialPageRoute(builder: (context) => SettingsScreen()));
242+
initPorts();
239243
}
240244
}
241245
}

lib/widgets/sensor_widget.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ class SensorWidget extends StatelessWidget {
5454
quarterTurns: -2,
5555
reverse: true,
5656
isPush: true,
57-
color: Color(0xFF622D5D),
57+
color: const Color(0xFF622D5D),
5858
),
5959
HalfSensorBarWidget(
6060
quarterTurns: 0,
6161
reverse: false,
6262
isPush: false,
63-
color: Color(0xFF2D3C62),
63+
color: const Color(0xFF2D3C62),
6464
),
6565
],
6666
),

0 commit comments

Comments
 (0)