diff --git a/lib/subghz/protocols/ws_generic.c b/lib/subghz/protocols/ws_generic.c index dd9f98bfa..e8baebf2f 100644 --- a/lib/subghz/protocols/ws_generic.c +++ b/lib/subghz/protocols/ws_generic.c @@ -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); } } \ No newline at end of file