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 |
|
Jason Kotzin
|
9da2d298c3
|
Merge commit '1ca9f234f7527396da91bfc1f98cb05c305c6472' into sam-update
|
2022-08-10 19:30:49 -07:00 |
|
Jason Kotzin
|
95a4ebf836
|
Merge commit '7365a44989c7c8561c583f75ff30f7277e712ff3' into sam-update
|
2022-08-10 19:30:16 -07:00 |
|
Jason Kotzin
|
3024cc1bfe
|
minor update to libopencm3, only build samd to speed up merge
|
2022-08-10 19:28:12 -07:00 |
|
Jason Kotzin
|
7340b0065d
|
Merge commit '93d4c659481c918b43c0068e69050ef1ad4ca91e' into sam-update
|
2022-08-10 19:08:37 -07:00 |
|
Jason Kotzin
|
dd01fe9ad3
|
upstream compile fixes
|
2022-08-10 19:08:35 -07:00 |
|
Jason Kotzin
|
336797363b
|
Merge commit '98b4ec58bc566591943c9123dd4ca0c8dcfd521e' into sam-update
# Conflicts:
# libopencm3
|
2022-08-10 19:08:25 -07:00 |
|
Jason Kotzin
|
046cc359ba
|
Merge commit 'dd6aadc54d00cee92e14bf7538d3ece3d3ab298f' into sam-update
|
2022-08-10 18:37:14 -07:00 |
|
Jason Kotzin
|
9e02c5f0cd
|
Merge commit 'cda83d308490738b54df0405cca3c0c048809664' into sam-update
# Conflicts:
# src/Makefile
|
2022-08-10 18:36:23 -07:00 |
|
Jason Kotzin
|
c73329f7d4
|
Merge commit '59dc1b7eb4f3a0fda23d2c8624c3ecd26515fec8' into sam-update
# Conflicts:
# src/platforms/common/cdcacm.c
|
2022-08-10 18:33:59 -07:00 |
|
Jason Kotzin
|
d90c207c50
|
adding cscope files to git ignore
|
2022-08-10 18:24:35 -07:00 |
|
Jason Kotzin
|
b87091a59b
|
Merge commit 'dc8924a2bc0110287c1b289002efb52926daccb0' into sam-update
# Conflicts:
# README.md
|
2022-08-10 18:24:25 -07:00 |
|
Jason Kotzin
|
f8aff4bf4b
|
upstream fixes
|
2022-08-10 18:19:15 -07:00 |
|
Jason Kotzin
|
50b9a4ceb6
|
Merge commit '77231e8972fa22cb233354ba5aed694dff4a9e24' into sam-update
|
2022-08-10 17:40:26 -07:00 |
|
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 |
|