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: Show irradiance values #123

Browse Source
This commit is contained in:
Janez T
2026-03-19 09:24:53 +01:00
parent e683ab933f
commit a32d5d2c85
8 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -211,8 +211,10 @@ List<SensorMetricOption> sensorMetricOptionsFor(
// Skip them from extraSensorData to avoid duplicates.
final coreFieldKeys = <String>{
if (batteryMilliVolts != null || batteryPercentage != null)
...extraSensorData?.keys.where((k) =>
k.startsWith('voltage_') || k.startsWith('analog_input_')) ?? [],
...extraSensorData?.keys.where(
(k) => k.startsWith('voltage_') || k.startsWith('analog_input_'),
) ??
[],
if (temperature != null)
...extraSensorData?.keys.where((k) => k.startsWith('temperature_')) ?? [],
if (humidity != null)
@@ -290,14 +292,14 @@ SensorMetricCardData? _buildOptionPreviewCardData(
);
case 'illuminance':
final lux = _previewAsDouble(value);
final irradiance = lux == null
? null
: _previewFormatDaylightIrradiance(lux);
return SensorMetricCardData(
fieldKey: fieldKey,
icon: Icons.light_mode_outlined,
label: label,
value: previewValue,
secondaryValue: lux == null
? null
: '~${_formatPreviewNumber(_previewApproxDaylightIrradiance(lux), maxFractionDigits: 1)} W/m2 daylight',
value: irradiance ?? previewValue,
accent: const Color(0xFFC17B1D),
channel: metricKey.channel,
);
@@ -674,6 +676,10 @@ double _previewApproxDaylightIrradiance(double lux) {
return lux / 120.0;
}
String _previewFormatDaylightIrradiance(double lux) {
return '~${_formatPreviewNumber(_previewApproxDaylightIrradiance(lux), maxFractionDigits: 1)} W/m2';
}
String _previewFormatCardinalDirection(double degrees) {
const points = <String>['N', 'NE', 'E', 'SE', 'S', 'SW', 'W', 'NW'];
final normalized = ((degrees % 360) + 360) % 360;
@@ -699,7 +705,7 @@ String? _sensorMetricPreviewValue(String rawKey, dynamic value) {
case 'illuminance':
final lux = _previewAsDouble(value);
if (lux == null) return null;
return '${_formatPreviewNumber(lux, maxFractionDigits: 0)} lx';
return _previewFormatDaylightIrradiance(lux);
case 'presence':
final isPresent = _previewAsBool(value);
@@ -1439,9 +1445,7 @@ class SensorTelemetryCard extends StatelessWidget {
fieldKey: _extraFieldKey(rawKey),
icon: Icons.light_mode_outlined,
label: label,
value: '${_formatNumber(lux, maxFractionDigits: 0)} lx',
secondaryValue:
'~${_formatNumber(_approxDaylightIrradiance(lux), maxFractionDigits: 1)} W/m2 daylight',
value: _formatDaylightIrradiance(lux),
accent: const Color(0xFFC17B1D),
channel: metricKey.channel,
);
@@ -1958,6 +1962,10 @@ class SensorTelemetryCard extends StatelessWidget {
return lux / 120.0;
}
String _formatDaylightIrradiance(double lux) {
return '~${_formatNumber(_approxDaylightIrradiance(lux), maxFractionDigits: 1)} W/m2';
}
String _formatCurrent(double amps) {
final absolute = amps.abs();
if (absolute < 1.0) {