From ea68a3047714b93fc62104f9e5709b6d8d90f35f Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Sat, 24 Feb 2024 22:17:53 +0000 Subject: [PATCH] Damn i missed this one (C/F Weather conv) --nobuild --- lib/subghz/protocols/oregon_v1.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/subghz/protocols/oregon_v1.c b/lib/subghz/protocols/oregon_v1.c index bced94a7d..b7593f005 100644 --- a/lib/subghz/protocols/oregon_v1.c +++ b/lib/subghz/protocols/oregon_v1.c @@ -306,12 +306,13 @@ SubGhzProtocolStatus void ws_protocol_decoder_oregon_v1_get_string(void* context, FuriString* output) { furi_assert(context); WSProtocolDecoderOregon_V1* instance = context; + bool locale_is_metric = furi_hal_rtc_get_locale_units() == FuriHalRtcLocaleUnitsMetric; furi_string_cat_printf( output, "%s\r\n%dbit\r\n" "Key:0x%lX%08lX\r\n" "Sn:0x%lX Ch:%d Bat:%d\r\n" - "Temp:%3.1f C Hum:%d%%", + "Temp:%3.1f %c Hum:%d%%", instance->generic.protocol_name, instance->generic.data_count_bit, (uint32_t)(instance->generic.data >> 32), @@ -319,6 +320,8 @@ void ws_protocol_decoder_oregon_v1_get_string(void* context, FuriString* output) instance->generic.id, instance->generic.channel, instance->generic.battery_low, - (double)instance->generic.temp, + (double)(locale_is_metric ? instance->generic.temp : + locale_celsius_to_fahrenheit(instance->generic.temp)), + locale_is_metric ? 'C' : 'F', instance->generic.humidity); }