ua1zbe/meshcore-sar_android
1
0
Fork 0
mirror of https://github.com/dz0ny/meshcore-sar.git synced 2026-08-11 16:30:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix: Stabilize reported tests #31

Browse Source 
ref: #32 #37
This commit is contained in:
Janez T
2026-04-26 08:24:07 +02:00
parent 2fe125d6ba
commit 0008eff1b8
6 changed files with 63 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/widgets/sensors/sensor_telemetry_card.dart
View File

@@ -238,15 +238,27 @@ List<SensorMetricOption> sensorMetricOptionsFor(
final coreFieldKeys = <String>{
if (batteryMilliVolts != null || batteryPercentage != null)
...extraSensorData?.keys.where(
(k) => k.startsWith('voltage_') || k.startsWith('analog_input_'),
(k) =>
_isSourceChannelMetric(extraSensorData, 'voltage', k) ||
_isSourceChannelMetric(extraSensorData, 'battery', k) ||
k.startsWith('analog_input_'),
) ??
[],
if (temperature != null)
...extraSensorData?.keys.where((k) => k.startsWith('temperature_')) ?? [],
...extraSensorData?.keys.where(
(k) => _isSourceChannelMetric(extraSensorData, 'temperature', k),
) ??
[],
if (humidity != null)
...extraSensorData?.keys.where((k) => k.startsWith('humidity_')) ?? [],
...extraSensorData?.keys.where(
(k) => _isSourceChannelMetric(extraSensorData, 'humidity', k),
) ??
[],
if (pressure != null)
...extraSensorData?.keys.where((k) => k.startsWith('pressure_')) ?? [],
...extraSensorData?.keys.where(
(k) => _isSourceChannelMetric(extraSensorData, 'pressure', k),
) ??
[],
};
if (extraSensorData != null) {
@@ -3117,6 +3129,18 @@ int? _sourceChannelForField(
return null;
}
bool _isSourceChannelMetric(
Map<String, dynamic>? extraSensorData,
String fieldKey,
String metricKey,
) {
final sourceChannel = _sourceChannelForField(extraSensorData, fieldKey);
if (sourceChannel == null) {
return false;
}
return metricKey == '${fieldKey}_$sourceChannel';
}
String _resolvedMetricLabel(
String fieldKey,
String defaultLabel, {