fixed merge conflict and copied max13865 code

This commit is contained in:
2021-03-05 12:57:42 +01:00
parent 93636426b6
commit b75eef7c51
163 changed files with 1207 additions and 16912 deletions

1
thirdparty/etl vendored Submodule

Submodule thirdparty/etl added at ae06e64177

1
thirdparty/lwgps vendored Submodule

Submodule thirdparty/lwgps added at d276f9722d