Merge branch 'dev' of github.com:JuanJakobo/flipperzero-firmware into dev

This commit is contained in:
JuanJakobo
2022-10-26 19:33:12 +02:00
5 changed files with 74 additions and 65 deletions
@@ -72,13 +72,13 @@ void dap_scene_help_on_enter(void* context) {
if(config->uart_swap == DapUartTXRXNormal) {
furi_string_cat(
string,
" TX: 15 [С1]\r\n"
" RX: 16 [С0]\r\n");
" TX: 15 [C1]\r\n"
" RX: 16 [C0]\r\n");
} else {
furi_string_cat(
string,
" RX: 15 [С1]\r\n"
" TX: 16 [С0]\r\n");
" RX: 15 [C1]\r\n"
" TX: 16 [C0]\r\n");
}
break;
default: