Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix and cleanup weather station info

Browse Source
This commit is contained in:
Willy-JL
2024-06-24 22:34:06 +02:00
parent ec4015960c
commit 9e8be87fe6
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/subghz/protocols/ws_generic.c
View File

@@ -198,22 +198,21 @@ SubGhzProtocolStatus ws_block_generic_deserialize_check_count_bit(
void ws_block_generic_get_string(WSBlockGeneric* instance, FuriString* output) {
furi_string_cat_printf(
output, "%s\r\n%dbit ", instance->protocol_name, instance->data_count_bit);
output, "%s\r\n%dbit", instance->protocol_name, instance->data_count_bit);
if(instance->channel != WS_NO_CHANNEL) {
furi_string_cat_printf(output, "Ch:%01d\r\n", instance->channel);
furi_string_cat_printf(output, " Ch: %01d", instance->channel);
}
if(instance->btn != WS_NO_BTN) {
furi_string_cat_printf(output, " Btn: %01d\r\n", instance->btn);
} else {
furi_string_cat(output, "\r\n");
}
if(instance->id != WS_NO_ID) {
furi_string_cat_printf(output, "Sn:0x%02lX ", instance->id);
}
if(instance->channel != WS_NO_BTN) {
furi_string_cat_printf(output, "Btn:%01d ", instance->btn);
furi_string_cat_printf(output, "Sn: 0x%02lX ", instance->id);
}
if(instance->battery_low != WS_NO_BATT) {
furi_string_cat_printf(
output, "Batt:%s\r\n", (!instance->battery_low ? "ok" : "low"));
furi_string_cat_printf(output, "Batt: %s\r\n", (!instance->battery_low ? "ok" : "low"));
} else {
furi_string_cat(output, "\r\n");
}
@@ -228,11 +227,11 @@ void ws_block_generic_get_string(WSBlockGeneric* instance, FuriString* output) {
bool is_metric = furi_hal_rtc_get_locale_units() == FuriHalRtcLocaleUnitsMetric;
furi_string_cat_printf(
output,
"Temp:%3.1f %c ",
"Temp: %3.1f%c ",
(double)(is_metric ? instance->temp : locale_celsius_to_fahrenheit(instance->temp)),
is_metric ? 'C' : 'F');
}
if(instance->humidity != WS_NO_HUMIDITY) {
furi_string_cat_printf(output, "Hum:%d%%", instance->humidity);
furi_string_cat_printf(output, "Hum: %d%%", instance->humidity);
}
}