|
547abf0cf2
|
Switch fallthrough missing break usbdfu
usbdfu should be updated later...
|
2023-01-04 23:41:07 +01:00 |
|
|
06b21b6d82
|
Fixed bad libopencm3 linker file
|
2023-01-04 23:27:32 +01:00 |
|
dragonmux
|
ad1868f8d4
|
command: Cleaned up and refactored cmd_rtt
# Conflicts:
# src/command.c
v1.8.4
|
2022-08-11 19:56:31 -07:00 |
|
dragonmux
|
c712a54cbc
|
rtt: Cleanup and fixes for the RTT over serial support as per #954
|
2022-08-11 19:45:58 -07:00 |
|
Koen De Vleeschauwer
|
a51d90ba2d
|
rtt
# Conflicts:
# src/gdb_main.c
|
2022-08-11 19:45:44 -07:00 |
|
Jason Kotzin
|
f67a4e421d
|
merge fixes and selective optimizations
v1.8.3
|
2022-08-11 19:28:10 -07:00 |
|
Jason Kotzin
|
8fc7a559b2
|
Merge commit '5cd430647ecfb6dab4a2ed858fb98567723de699' into stable
|
2022-08-11 19:15:01 -07:00 |
|
Jason Kotzin
|
c9a0be19cb
|
Merge commit '5e3cadec20a5fa3ec6eef53f23520707d0db5380' into sam-update
|
2022-08-10 22:33:40 -07:00 |
|
Jason Kotzin
|
2ca08f8511
|
Merge commit '84311b38881ec4a0934686579fec1054feaf5394' into sam-update
|
2022-08-10 22:32:18 -07:00 |
|
Jason Kotzin
|
3ae3095499
|
Merge commit 'c4869a54733ae92099a7316954e34d1ab7b6097c' into sam-update
|
2022-08-10 22:31:16 -07:00 |
|
Jason Kotzin
|
2a792399ca
|
Merge commit 'e535f53981da1fe80137504c761bc854ea8be356' into sam-update
|
2022-08-10 22:30:11 -07:00 |
|
Jason Kotzin
|
576f575871
|
Merge commit '7c120ecb582afb588cb391ab32614c4409a2671d' into sam-update
|
2022-08-10 22:28:35 -07:00 |
|
Jason Kotzin
|
e43b07172b
|
Merge commit 'a3feae60aab1fb85fe44b33123e020a9d7c8e18c' into sam-update
|
2022-08-10 22:26:37 -07:00 |
|
Jason Kotzin
|
e0f1d29d41
|
compile fix
|
2022-08-10 22:26:10 -07:00 |
|
Jason Kotzin
|
2a00dd88ec
|
Merge commit 'b59ca5142ad3a654dc173d598b826f5f453ae52b' into sam-update
|
2022-08-10 22:21:29 -07:00 |
|
Jason Kotzin
|
c121da06c8
|
Merge commit 'a0c77e216d268f2e1caa3442db02cf21f36fad91' into sam-update
|
2022-08-10 22:20:36 -07:00 |
|
Jason Kotzin
|
542c157955
|
Merge commit 'd9ef3ff14711457eaf0ea7152067c95b4bb45c03' into sam-update
|
2022-08-10 22:19:41 -07:00 |
|
Jason Kotzin
|
d4dd288426
|
Merge commit 'bba2bfdcf49695cb9b88482c7ed3db69db58b082' into sam-update
|
2022-08-10 22:18:39 -07:00 |
|
Jason Kotzin
|
b096e95488
|
Merge commit 'cedd9f9ac4fc02cc5ac152eb67024f714c6f95ab' into sam-update
|
2022-08-10 22:17:50 -07:00 |
|
Jason Kotzin
|
7bd7c3d0f5
|
Merge commit '8fb3b7b1a8d1cb2ac8b54204f452106939eb2ab7' into sam-update
# Conflicts:
# src/target/adiv5_swdp.c
|
2022-08-10 22:17:33 -07:00 |
|
Jason Kotzin
|
82673b5e7b
|
Merge commit '82c41cb739e3281e89319bd2fb9627d1a22c803b' into sam-update
|
2022-08-10 22:09:23 -07:00 |
|
Jason Kotzin
|
9542cd1cfb
|
Merge commit '48c6db19635a804621c7e08e5e3c705aa50e5e9d' into sam-update
|
2022-08-10 22:08:46 -07:00 |
|
Jason Kotzin
|
328be18288
|
Merge commit 'd259d5c5110d5867031a9d9ceaaf3725ce242857' into sam-update
|
2022-08-10 22:07:38 -07:00 |
|
Jason Kotzin
|
03331b3fff
|
Merge commit '4fe8fd8944ad49e40a46287e2286328af6871226' into sam-update
|
2022-08-10 22:06:28 -07:00 |
|
Jason Kotzin
|
ca1c0acb27
|
Merge commit '23534ab174ffadd63bbdb2e0626770753eff7c3b' into sam-update
|
2022-08-10 22:05:07 -07:00 |
|
Jason Kotzin
|
b4af0f5145
|
Merge commit '7d2afcff06f1ccd9fe583d562ddd81e04a17e166' into sam-update
|
2022-08-10 20:40:24 -07:00 |
|
Jason Kotzin
|
e174c5b503
|
Merge commit 'd594b42976e3b9640b64ef1cb2da3f74067930b8' into sam-update
# Conflicts:
# README.md
# src/platforms/common/cdcacm.c
# src/target/adiv5_swdp.c
|
2022-08-10 20:39:54 -07:00 |
|
Jason Kotzin
|
c91322e38e
|
fix stack compile warning
|
2022-08-10 20:37:14 -07:00 |
|
Jason Kotzin
|
85fc728293
|
Merge commit '59dc2255687436d7a21458615e4eb2e563ca64c1' into sam-update
|
2022-08-10 20:32:50 -07:00 |
|
Jason Kotzin
|
6727e74daf
|
Merge commit '28623e6b275b90817894ddcbf915dbb8c6686433' into sam-update
|
2022-08-10 20:31:54 -07:00 |
|
Jason Kotzin
|
d7bf91d039
|
Merge commit '7ccbdd98c0bd18c2a672ed50aa1f96aff97dd4af' into sam-update
|
2022-08-10 20:31:11 -07:00 |
|
Jason Kotzin
|
878dc379b9
|
updates for merge
|
2022-08-10 20:30:57 -07:00 |
|
Jason Kotzin
|
4f97627b02
|
Merge commit '64f756d62791e16728e6c9d7877ce2ab620b9c1c' into sam-update
|
2022-08-10 20:25:30 -07:00 |
|
Jason Kotzin
|
56858650cb
|
Merge commit '88cce08ce47b7b6f6f40b404fa79c6be687ab7e3' into sam-update
|
2022-08-10 20:24:43 -07:00 |
|
Jason Kotzin
|
dcbb1657b4
|
Merge commit 'da15cc3cb75cc2a9f604436402f6a81d42b27dce' into sam-update
|
2022-08-10 20:23:40 -07:00 |
|
Jason Kotzin
|
9dc79becc2
|
Merge commit '35687018eb634ea329609c86d9ed476bb79c0e91' into sam-update
# Conflicts:
# src/platforms/common/cdcacm.c
# src/target/adiv5_swdp.c
|
2022-08-10 20:19:55 -07:00 |
|
Jason Kotzin
|
9ec6693e4d
|
Merge commit '2a0d608b07487300a63908baa62e73a51a11e811' into sam-update
|
2022-08-10 20:14:55 -07:00 |
|
Jason Kotzin
|
a2f6776bf8
|
Merge commit '8089e05a0018a040251ec5de145bccca0977bf78' into sam-update
|
2022-08-10 20:13:59 -07:00 |
|
Jason Kotzin
|
cb1ef7d616
|
Merge commit '1330288271bea7b6224bac5bc8e1438305eec44a' into sam-update
|
2022-08-10 20:09:58 -07:00 |
|
Jason Kotzin
|
def176b240
|
Merge commit '8da2dee0c41eead0c2b4f466fbc889ef413cf7e9' into sam-update
|
2022-08-10 20:08:13 -07:00 |
|
Jason Kotzin
|
d5a8717bb0
|
stack bug fix
|
2022-08-10 20:08:05 -07:00 |
|
Jason Kotzin
|
8acda14170
|
Merge commit '23f942ac8c7553f743128d9f96f0d2aa61fbc4bd' into sam-update
|
2022-08-10 20:07:25 -07:00 |
|
Jason Kotzin
|
c1e34792f4
|
Merge commit '04d1c9805b80b50b4f1cd33b08503b73e80c0ed3' into sam-update
|
2022-08-10 20:06:04 -07:00 |
|
Jason Kotzin
|
c5b6f066b8
|
Merge commit 'b6fbf86743509559fce4c56345e8fdc16df14a08' into sam-update
|
2022-08-10 19:55:26 -07:00 |
|
Jason Kotzin
|
f109bc2e98
|
Merge commit '61e237ec87c525876817e72fc82ce28b2a4951ae' into sam-update
|
2022-08-10 19:53:14 -07:00 |
|
Jason Kotzin
|
d36213b7d0
|
Merge commit 'be3bfc48a8be7cd4d84709e98c5def13259d49f6' into sam-update
# Conflicts:
# README.md
|
2022-08-10 19:49:50 -07:00 |
|
Jason Kotzin
|
389bb03fc0
|
Merge commit 'db17f2caa8dcbf229670ba03b46be274656c6d72' into sam-update
|
2022-08-10 19:48:49 -07:00 |
|
Jason Kotzin
|
78837173a4
|
Merge commit 'e6a9a1a3665e83e25d5d4077a33aa5b0110646b8' into sam-update
# Conflicts:
# .gitignore
|
2022-08-10 19:48:21 -07:00 |
|
Jason Kotzin
|
4328e8a4c1
|
Merge commit 'aa0d8f4b5de13f4fb7324a690a4bb7aa411e767f' into sam-update
|
2022-08-10 19:46:16 -07:00 |
|
Jason Kotzin
|
646fbcb21f
|
fixes for upstream
|
2022-08-10 19:46:01 -07:00 |
|