Skip to content

Commit c250f29

Browse files
committed
Merge branch 'main' into Devel
2 parents 1c26db0 + e06aa25 commit c250f29

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

CHANGES.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,17 @@ Version 2.00 in Progress
1515
* (From V1.11) Fix depreciation warning with latest versions of libftdi
1616
* (From V1.11) Fix bitrot in documentation URL (master -> main transition, Jan Christoph Bernack)
1717

18+
3rd June 2022 (Version 1.13)
19+
20+
* Fix -v missing parameter
21+
* Allow orbcat sockets to reconnect on loss of connection
22+
* Add SAM5X SWO support
23+
* Prevent segfault in orbtop when elf changes
24+
* Fix assert when fpga has no data to deliver
25+
* Add pyocd to list of trace sources
26+
*Complete fix for specified length integers on 32 bit platforms (Rasbian support)
27+
* Compatability with languages other than C family (specifically Rust)
28+
1829
23rd October 2020 (Version 1.10)
1930

2031
* Replace `master` with `main`.

Src/orbcat.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ struct
5050

5151
char *file; /* File host connection */
5252
bool endTerminate; /* Terminate when file/socket "ends" */
53+
5354
} options = {.forceITMSync = true, .tpiuChannel = 1, .port = NWCLIENT_SERVER_PORT, .server = "localhost"};
5455

5556
struct
@@ -613,6 +614,7 @@ int socketFeeder( void )
613614

614615
close( sockfd );
615616
return -2;
617+
616618
}
617619

618620
// ====================================================================================================

Support/gdbtrace.init

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,6 @@ enableSTM32SWO Configure output pin on STM32 for SWO use.
386386
end
387387
# ====================================================================
388388
define enableSAMD5XSWD
389-
390-
_setAddressesSAM
391389
# Enable peripheral channel clock on GCLK#0
392390
# GCLK->PHCTRL[47] = GCLK_PCHCTRL_GEN(0)
393391
set *(unsigned char *)0x40001D3C = 0

0 commit comments

Comments
 (0)