summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHierophect <hierophect@gmail.com>2019-07-23 15:28:48 -0400
committerHierophect <hierophect@gmail.com>2019-07-23 15:28:48 -0400
commit5ee5c35833c23828db99c8d7f4ed7035c3e418c7 (patch)
tree9db1a81e520e348262fe6633c2ebf72774657e3f
parent5cfde7b6ea9c256106a9977db8bcadc8361712d5 (diff)
Doc error caused by submodule, misc cleanup
-rw-r--r--.gitmodules1
-rw-r--r--conf.py2
m---------lib/tinyusb0
3 files changed, 2 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index e2845395a..639e8dc79 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -77,6 +77,7 @@
path = lib/tinyusb
url = https://github.com/hathach/tinyusb.git
branch = develop
+ ignore = dirty
[submodule "tools/huffman"]
path = tools/huffman
url = https://github.com/tannewt/huffman.git
diff --git a/conf.py b/conf.py
index 1ad6ed005..087bea097 100644
--- a/conf.py
+++ b/conf.py
@@ -121,7 +121,7 @@ exclude_patterns = ["**/build*",
"ports/nrf/nrfx",
"ports/nrf/peripherals",
"ports/nrf/usb",
- "ports/stm32f4/stm32cube",
+ "ports/stm32f4/stm32f4",
"ports/stm32f4/peripherals",
"ports/stm32f4/ref",
"ports/stm32f4/README.md",
diff --git a/lib/tinyusb b/lib/tinyusb
-Subproject 0848c462b3e431a9da42e96537d2b597a457963
+Subproject 97e2629d647584681b2883f2081fa2cddb3d61c