Pull modules, except mbedos (since mbedos compile fails) (#10230)

project-chip · Oct 5, 2021 · 531845e · 531845e
1 parent 3c2b8d1
commit 531845e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -17,7 +17,7 @@
 [submodule "mbedtls"]
 	path = third_party/mbedtls/repo
 	url = https://github.com/ARMmbed/mbedtls.git
-	branch  = mbedtls-2.25
+	branch  = mbedtls-2.25.0
 [submodule "qrcode"]
 	path = examples/common/QRCode/repo
 	url = https://github.com/nayuki/QR-Code-generator.git

diff --git a/examples/common/QRCode/repo b/examples/common/QRCode/repo
diff --git a/examples/common/m5stack-tft/repo b/examples/common/m5stack-tft/repo
diff --git a/third_party/bluez/repo b/third_party/bluez/repo
diff --git a/third_party/nanopb/repo b/third_party/nanopb/repo
+122 −110		Readme.markdown
+1 −1		c/Makefile
+17 −17		c/qrcodegen-test.c
+0 −118		c/qrcodegen-worker.c
+36 −36		c/qrcodegen.c
+14 −14		c/qrcodegen.h
+3 −3		cpp/Makefile
+35 −2		cpp/QrCodeGeneratorDemo.cpp
+0 −101		cpp/QrCodeGeneratorWorker.cpp
+31 −59		cpp/qrcodegen.cpp
+17 −24		cpp/qrcodegen.hpp
+103 −22		java/QrCodeGeneratorDemo.java
+35 −3		java/pom.xml
+3 −3		java/src/main/java/io/nayuki/qrcodegen/DataTooLongException.java
+28 −91		java/src/main/java/io/nayuki/qrcodegen/QrCode.java
+0 −100		java/src/main/java/io/nayuki/qrcodegen/QrCodeGeneratorWorker.java
+41 −21		java/src/main/java/io/nayuki/qrcodegen/QrSegment.java
+16 −8		java/src/main/java/io/nayuki/qrcodegen/QrSegmentAdvanced.java
+3 −3		java/src/main/java/io/nayuki/qrcodegen/package-info.java
+29 −0		java/src/main/java/module-info.java
+0 −142		python/qrcodegen-batch-test.py
+21 −1		python/qrcodegen-demo.py
+0 −81		python/qrcodegen-worker.py
+135 −184		python/qrcodegen.py
+4 −4		python/setup.py
+2 −1		rust/Cargo.toml
+9 −7		rust/Readme.markdown
+36 −13		rust/examples/qrcodegen-demo.rs
+0 −113		rust/examples/qrcodegen-worker.rs
+61 −85		rust/src/lib.rs
+0 −5		typescript-javascript/build.sh
+25 −3		typescript-javascript/qrcodegen-input-demo.html
+50 −4		typescript-javascript/qrcodegen-input-demo.ts
+10 −1		typescript-javascript/qrcodegen-output-demo.html
+37 −17		typescript-javascript/qrcodegen-output-demo.ts
+0 −130		typescript-javascript/qrcodegen-worker.ts
+43 −77		typescript-javascript/qrcodegen.ts
+10 −0		README.md
+0 −1		components/tft/tftspi.h
+0 −1		main/tft_demo.c
+23 −18		CMakeLists.txt
+1 −1		docs/concepts.md
+12 −0		docs/migration.md
+1 −1		docs/reference.md
+17 −2		generator/nanopb_generator.py
+4 −0		generator/proto/Makefile
+1 −1		generator/protoc-gen-nanopb.bat
+1 −1		generator/protoc.bat
+31 −11		pb.h
+8 −4		pb_decode.c
+10 −0		pb_encode.c
+3 −3		tests/fuzztest/SConscript
+9 −0		tests/regression/issue_692/SConscript
+19 −0		tests/regression/issue_692/oneof.proto
+9 −0		tests/regression/issue_692/other.proto
+7 −0		tests/regression/issue_692/test.c
+3 −3		tests/site_scons/site_init.py
+4 −4		tests/site_scons/site_tools/nanopb.py
+1 −1		tools/make_linux_package.sh
+1 −1		tools/set_version.sh