Jason Kotzin
|
93cf62d944
|
Merge commit '8289862b55e2a0dc658c3c7e2f6ab9878d0527fa' into sam-update
# Conflicts:
# README.md
# src/platforms/common/cdcacm.c
|
2022-08-10 17:40:24 -07:00 |
|
Jason Kotzin
|
09e45cea5b
|
Merge commit 'a4cdd6b3103cdf6c1f8454fb81558ff98a8d912d' into sam-update
|
2022-08-10 17:36:48 -07:00 |
|
Jason Kotzin
|
65c95fb413
|
Merge commit 'f5e305e237aba0ab8bf2f42e75505ef468f47d82' into sam-update
# Conflicts:
# README.md
|
2022-08-10 17:36:47 -07:00 |
|
Jason Kotzin
|
c643726c9d
|
Merge commit 'da45281696b05089d694e6e9c7734968b9496865' into sam-update
|
2022-08-10 17:35:15 -07:00 |
|
Jason Kotzin
|
eda19bc28d
|
Merge commit 'ef816e318391c64014554140be65a5cafc6c8be2' into sam-update
# Conflicts:
# .gitignore
|
2022-08-10 17:34:55 -07:00 |
|
Jason Kotzin
|
9b145c8398
|
compatibility to upstream
|
2022-08-10 17:27:05 -07:00 |
|
Jason Kotzin
|
53c6821734
|
Merge commit '9969c984f3ca67f38677b061e2f91a1fb50cd310' into sam-update
|
2022-08-10 15:57:56 -07:00 |
|
Jason Kotzin
|
842a0b4193
|
compatibility with merge changes
|
2022-08-10 15:57:41 -07:00 |
|
Jason Kotzin
|
8a37449f8a
|
Merge commit 'e34a27f72c9689850e97df74c499538d7f18518d' into sam-update
# Conflicts:
# src/include/swdptap.h
# src/platforms/common/swdptap.c
|
2022-08-10 15:57:29 -07:00 |
|
Jason Kotzin
|
21989d4142
|
Merge commit '1e10b96b03da71b1a101c108ca9511c8a613666e' into sam-update
|
2022-08-09 22:17:14 -07:00 |
|
Jason Kotzin
|
63449912e2
|
Merge commit 'f3790b90e5ecf44525dc05f05a4e72f74baea411' into sam-update
|
2022-08-09 22:11:55 -07:00 |
|
Jason Kotzin
|
1661396951
|
Merge commit '05adcd9bf5b36d099627aff6b73e463030ee417f' into sam-update
|
2022-08-09 22:06:01 -07:00 |
|
Jason Kotzin
|
fd6610bdae
|
samd fix USB max packet size
|
2022-08-09 17:31:30 -07:00 |
|
Jason Kotzin
|
19e01abf70
|
Merge commit '16967b43288028dcdc2759bb2a25a53472571162' into sam-update
|
2022-08-09 17:25:16 -07:00 |
|
Jason Kotzin
|
a89b2ead47
|
Merge commit '541861e978ba88c80e7e2a0cbcd7ce55d574c97b' into sam-update
# Conflicts:
# README.md
|
2022-08-09 17:23:48 -07:00 |
|
Jason Kotzin
|
81cfa0a380
|
Merge commit '1a83bc68920ad20ad044e9110c3599e3ac1f76c0' into sam-update
# Conflicts:
# src/command.c
|
2022-08-09 17:22:19 -07:00 |
|
Jason Kotzin
|
41449370b4
|
Merge commit 'd63e870e82ecbd73af2d14e6794d2985cb9bd0ad' into sam-update
|
2022-08-09 17:13:06 -07:00 |
|
Jason Kotzin
|
73285885b3
|
Merge commit 'a0e42e229b99dad09f3c2eaf1455cbefc776cbe8' into sam-update
|
2022-08-09 17:11:21 -07:00 |
|
Jason Kotzin
|
b71213522a
|
change spec to decrease code size
|
2022-08-08 21:14:10 -07:00 |
|
Jason Kotzin
|
c0c5255103
|
libopencm3 regression fix
|
2022-08-08 21:06:18 -07:00 |
|
Jason Kotzin
|
a2cdb32f14
|
Merge commit '2e185ba578cf996a9e6cd7b6a0321a2448064e52' into sam-update
|
2022-08-02 09:35:57 -07:00 |
|
Jason Kotzin
|
1930380e16
|
Merge commit '0b6f393d5b1ab03fc0dcd8b172261e7a52bdd3d8' into sam-update
|
2022-08-02 09:35:19 -07:00 |
|
Jason Kotzin
|
5509264a2b
|
Merge commit 'ea779d13725f1c2c580c5c11c47267af09b6b007' into sam-update
|
2022-08-02 09:35:09 -07:00 |
|
Jason Kotzin
|
6f902bcfe7
|
optimization flag for jeff probe
|
2022-08-02 09:35:01 -07:00 |
|
Jason Kotzin
|
fdce017311
|
Merge commit 'f89542c79f6edb0d64e7dfa483501718113f45b5' into sam-update
|
2022-08-02 09:28:24 -07:00 |
|
Jason Kotzin
|
96a980b682
|
Merge commit '286b987822a685f6ff86f6522da3733a0c9d7757' into sam-update
# Conflicts:
# src/command.c
|
2022-08-02 09:28:14 -07:00 |
|
Jason Kotzin
|
cedcd1a832
|
Merge commit '71b8a4e0818026fa25e9fa95b2cd3c0dd407b3a2' into sam-update
|
2022-08-02 09:21:00 -07:00 |
|
Jason Kotzin
|
1737788a92
|
Merge commit 'd1ee827b4df710a0f693f6df7808cb5d75b2530c' into sam-update
|
2022-08-02 09:20:50 -07:00 |
|
Jason Kotzin
|
f65793582d
|
Merge commit '5704c2fb5a07bbe7982a368e6ab7762a6866988f' into sam-update
# Conflicts:
# src/Makefile
|
2022-08-02 09:20:27 -07:00 |
|
Jason Kotzin
|
90a7ecaaf1
|
Merge commit 'e8bd066fe96f72c6998aea7c0d80d6de019b825d' into sam-update
# Conflicts:
# README.md
|
2022-08-02 01:31:38 -07:00 |
|
Jason Kotzin
|
b6896898c2
|
Merge commit '82be49f05212d36733ab99c6f83ef93a7ff444d1' into sam-update
|
2022-08-02 01:31:04 -07:00 |
|
Jason Kotzin
|
81bb75bba6
|
Merge commit '443ced62d4e47d73da13746a836369d8421b4fe8' into sam-update
# Conflicts:
# libopencm3
|
2022-08-02 01:23:28 -07:00 |
|
Jason Kotzin
|
6661871707
|
Merge commit 'fbf196378e5bbeffad02439fa974f6142a78d6a2' into sam-update
|
2022-08-01 21:46:52 -07:00 |
|
Jason Kotzin
|
885fdcc354
|
Merge commit '5107a29699904fb4e60907d1e9b2438592f6a3ff' into sam-update
|
2022-08-01 21:46:24 -07:00 |
|
Jason Kotzin
|
16261813ca
|
Merge commit 'e29f2b4fb95601291afced3af3731385be343988' into sam-update
# Conflicts:
# .gitignore
# src/include/swdptap.h
# src/target/swdptap_generic.c
|
2022-08-01 21:45:01 -07:00 |
|
Jason Kotzin
|
fcf5b74542
|
Merge commit '067956266c886d377231ffdd89e630e41aeb2783' into sam-update
|
2022-08-01 20:43:02 -07:00 |
|
Jason Kotzin
|
539fba02ac
|
Merge commit '9e898cc4b8f3e1a5844a3693412a9977a65a0a63' into sam-update
|
2022-08-01 20:30:35 -07:00 |
|
Jason Kotzin
|
4a2a121e89
|
Merge commit 'dd3cb193f3a83e99b5a915e9942c295b9d9715d7' into sam-update
|
2022-08-01 20:30:04 -07:00 |
|
Jason Kotzin
|
16b827e4e4
|
Merge commit 'c44cb904b0d345753b40ac9649bb4c611855a5c4' into sam-update
# Conflicts:
# src/target/adiv5.c
|
2022-08-01 20:29:58 -07:00 |
|
Jason Kotzin
|
a9197e67ea
|
Merge commit '205fce20e5ade52b6331e315ccd0700293f51aac' into sam-update
|
2022-08-01 20:22:28 -07:00 |
|
Jason Kotzin
|
ab63700a80
|
Merge commit '9ed26645d332dbd1d725ccef64199ef13604686c' into sam-update
|
2022-08-01 20:22:07 -07:00 |
|
Jason Kotzin
|
0993a8ae28
|
Merge commit 'fd3af639b0f8eb816d4efc860f549e8c01454826' into sam-update
|
2022-08-01 20:21:48 -07:00 |
|
Jason Kotzin
|
a7c4a0c108
|
Merge commit 'bd530c8951f8393e8d799d25f233c77051b10561' into sam-update
|
2022-08-01 20:21:34 -07:00 |
|
Jason Kotzin
|
bb97e35f82
|
Merge commit '5aebef4f64d0fd4c19f794fb9725686c39a7e395' into sam-update
|
2022-08-01 20:21:13 -07:00 |
|
Jason Kotzin
|
cbed6c911f
|
Merge commit 'df7458e35a67abb216d9816c59f218cad45f1c44' into sam-update
|
2022-08-01 20:20:38 -07:00 |
|
Jason Kotzin
|
272b461b3e
|
Merge commit 'b4c680bb150b815df401c98c45f03ff45e5a231f' into sam-update
|
2022-08-01 20:18:49 -07:00 |
|
Jason Kotzin
|
a29d53cb31
|
Merge commit '600bc9f0294f07a5572511c98041710d80d95769' into sam-update
|
2022-08-01 20:18:03 -07:00 |
|
Jason Kotzin
|
4947f0f747
|
Merge commit '61e9607594586fe5018157f566b8b79a398444b7' into sam-update
# Conflicts:
# src/Makefile
|
2022-08-01 20:17:24 -07:00 |
|
Jason Kotzin
|
a6f8944afe
|
Merge commit '88ec55768389c6c4de69ecd6e101f6b136c25a8f' into sam-update
|
2022-08-01 20:10:32 -07:00 |
|
Jason Kotzin
|
33c0319263
|
Merge commit '2b4000b2b44ca629d18d96a803413c71ab7b8e52' into sam-update
|
2022-08-01 20:09:50 -07:00 |
|